修复了触摸屏报工页面的bug
This commit is contained in:
parent
263b7cc9bf
commit
063d116b32
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
|
|
@ -17,7 +17,8 @@
|
|||
<div class="gx-item">
|
||||
<div class="gx-item-col">
|
||||
|
||||
<div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name }}</div>
|
||||
<div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name }}
|
||||
</div>
|
||||
<div>部件：{{ item.component_detail ? item.component_detail.name : '' }}</div>
|
||||
<div>工序：{{ item.process_detail ? item.process_detail.name : '' }}</div>
|
||||
|
||||
|
|
@ -67,7 +68,8 @@
|
|||
<div class="gx-item">
|
||||
<div class="gx-item-col">
|
||||
|
||||
<div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name }}</div>
|
||||
<div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name
|
||||
}}</div>
|
||||
<div>工序：{{ item.process_detail ? item.process_detail.name : '' }}</div>
|
||||
|
||||
<div>状态：
|
||||
|
|
@ -86,12 +88,12 @@
|
|||
<a-button style="margin-left: 3px;" @click="pageReport(item, true)"
|
||||
v-if="item.is_complete == 1">撤销报工</a-button>
|
||||
</div>
|
||||
<div style="margin-top: 10px;font-size: 14px;" v-if="item.plan_complete_time">
|
||||
计划完成:{{ getDateValueString(item.plan_complete_time) }}
|
||||
</div>
|
||||
<div style="margin-top: 10px;font-size: 14px;" v-if="item.plan_complete_time">
|
||||
计划完成:{{ getDateValueString(item.plan_complete_time) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -166,15 +168,16 @@
|
|||
<a-tab-pane key="2" tab="即将超时布产列表" force-render>
|
||||
<vxe-table border show-overflow keep-source ref="xTable3" :height="610" :row-config="{ height: 80 }"
|
||||
:data="poData">
|
||||
|
||||
<vxe-column field="code" title="编码" width="130"></vxe-column>
|
||||
<vxe-column field="mold_master_name" title="模具师傅" width="130"></vxe-column>
|
||||
<vxe-column field="engineer_name" title="工程师傅" width="130"></vxe-column>
|
||||
<vxe-column field="mold_master_name" title="模具师傅" width="110"></vxe-column>
|
||||
<vxe-column field="engineer_name" title="工程师傅" width="110"></vxe-column>
|
||||
<vxe-column field="complete_time" formatter="formatDate" title="要求完成时间" width="160"></vxe-column>
|
||||
<vxe-column field="mold_detail" formatter="formatRef" :params="{ dataType: 'object', textField: 'name' }"
|
||||
title="模具" width="130"></vxe-column>
|
||||
<vxe-column title="模具图片" width="110">
|
||||
title="模具" width="auto"></vxe-column>
|
||||
<vxe-column title="图片" width="75">
|
||||
<template #default="{ row }">
|
||||
<img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image"
|
||||
<img v-if="row.mold_detail.image" style="width:52px;height:52px;" :src="row.mold_detail.image"
|
||||
@click.stop="$hevueImgPreview(row.mold_detail.image)" />
|
||||
<span v-else></span>
|
||||
</template>
|
||||
|
|
@ -187,6 +190,7 @@
|
|||
</vxe-table>
|
||||
|
||||
|
||||
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
|
||||
|
|
@ -934,7 +938,7 @@ export default {
|
|||
progress = parseFloat(progress).toFixed(2);
|
||||
}
|
||||
return progress;
|
||||
|
||||
|
||||
},
|
||||
|
||||
},
|
||||
|
|
@ -1024,11 +1028,21 @@ export default {
|
|||
}
|
||||
|
||||
.container {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-top: 10px;
|
||||
display: grid;
|
||||
grid-template-columns: 10fr 13fr;
|
||||
grid-gap: 0px;
|
||||
|
||||
}
|
||||
|
||||
.left {}
|
||||
|
||||
.right {
|
||||
margin-left: 10px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.card {
|
||||
background-color: white;
|
||||
margin-top: 10px;
|
||||
|
|
@ -1042,14 +1056,6 @@ export default {
|
|||
font-size: 22px;
|
||||
}
|
||||
|
||||
.left {
|
||||
flex: 5;
|
||||
}
|
||||
|
||||
.right {
|
||||
flex: 5;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.card .vxe-form .vxe-form--item-inner {
|
||||
min-height: 24px;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
<div class="header">
|
||||
<img alt="logo" class="logo" :src="Project.project_logo" />
|
||||
|
||||
|
||||
<div class="title">{{ Project.project_name }}
|
||||
<!-- 如果 Project.project_sub_title 不为空，则显示 -->
|
||||
<i v-if="Project.project_sub_title"><b>|</b> {{ Project.project_sub_title }}</i>
|
||||
|
|
@ -112,7 +113,10 @@ export default {
|
|||
mobile: '',
|
||||
password: ''
|
||||
},
|
||||
Project: [],
|
||||
Project: [
|
||||
{
|
||||
project_logo: '@/assets/img/logo-1.png',
|
||||
}],
|
||||
companyShow: false,
|
||||
companyData: [],
|
||||
company: Cookie.get('company'),
|
||||
|
|
@ -121,7 +125,7 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
},
|
||||
beforeMount() { // 页面挂载之前
|
||||
beforeCreate() { // 页面挂载之前
|
||||
|
||||
getProject().then(result => { // 获取项目信息
|
||||
this.Project = result.data.data
|
||||
|
|
@ -149,8 +153,8 @@ export default {
|
|||
password: this.user.password
|
||||
});
|
||||
|
||||
this.$refs.loginActions.initRoutes({ });
|
||||
|
||||
this.$refs.loginActions.initRoutes({});
|
||||
|
||||
}, 1000)
|
||||
}) // loadsh的pick方法
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue