root/chengHou
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大屏更新

Browse Source
This commit is contained in:
ludj
2022-11-22 14:27:21 +08:00
parent 6b6558e498
commit dabd61fda0
13 changed files with 132 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms/qd/src/layout/components/Navbar.vue
View File

@@ -16,9 +16,9 @@
<screenfull id="screenfull" class="right-menu-item hover-effect" />
</el-tooltip>
<el-tooltip content="布局设置" effect="dark" placement="bottom">
<!--<el-tooltip content="布局设置" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip>
</el-tooltip>-->
</template>

8
wms/qd/src/views/wms/pdm/produceTask/bigScreen.vue
View File

@@ -1,7 +1,7 @@
<template>
<div style="border: 1px solid #938d8d;margin-left: 10px;margin-right: 10px;">
<el-row>
<el-col :span="12">
<el-col :span="14">
<div class="grid-content bg-purple"><h2 style="margin-left: 30px;padding-top: 10px;">车间加工看板</h2></div>
<div class="grid-content bg-purple">
&ensp;&ensp;
@@ -14,7 +14,7 @@
</div>
</el-col>
<el-col :span="12">
<el-col :span="10">
<div class="grid-content bg-purple-light">
<h2 style="text-align:right;margin-right: 140px;">{{ getTime }}</h2>
</div>
@@ -165,10 +165,10 @@ export default {
console.log(err.response.data.message)
})
}).catch(() => {
this.$message({
/*this.$message({
type: 'info',
message: '已取消'
})
})*/
})
}
}

2
wms/qd/src/views/wms/sch/point/MaterLabelDialog.vue
View File

@@ -81,7 +81,7 @@
<el-table-column prop="material_spec" label="产品规格" />
<el-table-column prop="material_code" label="产品编码" />
<el-table-column prop="material_name" label="产品名称" />
<el-table-column prop="label_code" label="最新标签码" width="150" show-overflow-tooltip/>
<el-table-column v-if="false" prop="label_code" label="最新标签码" width="150" show-overflow-tooltip/>
<el-table-column prop="dtl_count" label="打印次数" />
<el-table-column prop="stand_hour" label="静置小时" />
</el-table>

39
wms/qd/src/views/wms/sch/point/index.vue
View File

@@ -156,21 +156,6 @@
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type1==='01'" />
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
size="small"
placeholder="点位状态"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型" prop="lock_type">
<el-select
v-model="form.lock_type"
@@ -186,15 +171,34 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
size="small"
placeholder="点位状态"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="物料标签id">
<el-input v-model="form.label_uuid" style="width: 370px;" @focus="getMater" />
</el-form-item>
<el-form-item v-if="false" label="物料id">
<el-input v-model="form.material_uuid" style="width: 370px;" @focus="getMater" />
</el-form-item>
<el-form-item v-if="form.point_status==='02' && form.point_type1==='01'" label="物料名称">
<el-form-item v-if="form.point_status==='02' && form.point_type1==='01'" label="物料">
<el-input v-model="form.material_name" style="width: 370px;" @focus="getMater" />
</el-form-item>
<el-form-item v-if="form.point_status==='02' && form.point_type1==='01'" label="重量">
<el-input v-model="form.weight" style="width: 370px;" />
</el-form-item>
<el-form-item v-if="form.point_status!=='00'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
@@ -420,10 +424,9 @@ export default {
this.materDialog = true
},
tableChanged(row) {
console.log(row)
this.form.label_uuid = row.label_uuid
this.form.material_uuid = row.material_uuid
this.form.material_name = row.material_name
this.form.material_name = row.formula + '-' + row.pcsn
}
}
}