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

feat: wpm_gx mlog界面优化

This commit is contained in:
caoqianming 2024-08-13 10:33:48 +08:00
parent 009e2c05bb
commit 28516c89dd
14 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/wpm_gx/chaoxi.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/chaoxi2.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/chaoxi3.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/daojiao.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

1
src/views/wpm_gx/handover.vue
View File

@ -82,6 +82,7 @@
type="primary" type="primary"
>交送</el-text >交送</el-text
> >
<span style="width: 4px;"></span>
<el-text <el-text
v-if="scope.row.recive_mgroup == mgroupId" v-if="scope.row.recive_mgroup == mgroupId"
type="success" type="success"

4
src/views/wpm_gx/heihua.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/jianbo.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/jingdiao.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

21
src/views/wpm_gx/mlogs.vue
View File

@ -41,17 +41,13 @@
<el-table-column <el-table-column
label="生产路线" label="生产路线"
prop="material_out_name" prop="material_out_name"
min-width="100" min-width="130"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="预计工时" label="预计工时"
prop="hour_work" prop="hour_work"
></el-table-column> width="80"
<el-table-column
label="工段名称"
prop="mgroup_name"
min-width="100"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产设备" label="生产设备"
@ -59,12 +55,17 @@
min-width="150" min-width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="所属部门" label="部门/工段"
prop="belong_dept_name" prop="belong_dept_name"
></el-table-column> >
<template #default="scope">
{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
</template>
</el-table-column>
<el-table-column <el-table-column
label="处理人" label="处理人"
prop="handle_user_name" prop="handle_user_name"
width="80"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="开始时间" label="开始时间"
@ -74,10 +75,10 @@
label="结束时间" label="结束时间"
prop="work_end_time" prop="work_end_time"
></el-table-column> ></el-table-column>
<el-table-column <!-- <el-table-column
label="创建时间" label="创建时间"
prop="create_time" prop="create_time"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
label="操作" label="操作"
fixed="right" fixed="right"

4
src/views/wpm_gx/mopao.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

18
src/views/wpm_gx/mtask.vue
View File

@ -1,8 +1,5 @@
<template> <template>
<el-container> <el-container>
<el-header>
<h2>任务列表</h2>
</el-header>
<el-main> <el-main>
<scTable <scTable
ref="table" ref="table"
@ -12,25 +9,16 @@
:params="params" :params="params"
> >
<el-table-column <el-table-column
label="#" label="任务列表"
type="index" type="index"
width="50" width="80"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="产品名称" label="产品名"
prop="material_out_name" prop="material_out_name"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="型号规格">
<template #default="scope">
<span v-if="scope.row.material_out_"
>{{ scope.row.material_out_.specification }}|{{
scope.row.material_out_.model
}}</span
>
</template>
</el-table-column>
<el-table-column <el-table-column
label="任务编号" label="任务编号"
prop="number" prop="number"

4
src/views/wpm_gx/qiepian.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/saobian.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/shaojie.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover