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

rev:刻字后端代码

Browse Source
This commit is contained in:
zhangzhiqiang
2023-07-03 14:28:32 +08:00
parent ec0fd6cd53
commit 128272a27d
28 changed files with 277 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/qd/src/layout/components/Sidebar/Logo.vue
View File

@@ -34,7 +34,7 @@ export default {
},
data() {
return {
title: '海量mes系统',
title: '海亮mes系统',
logo: Logo,
title_param: 'platform'
}

2
mes/qd/src/views/login.vue
View File

@@ -2,7 +2,7 @@
<div class="login" :style="'background-image:url('+ Background +');'">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
<h3 class="title">
海量mes系统
海亮mes系统
</h3>
<el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

4
mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
View File

@@ -157,8 +157,8 @@
<el-table-column prop="nok_qty" label="报废数量" />
<el-table-column prop="repare_qty" label="报修数量" />
<el-table-column prop="person_finish_qty" label="人员期末数量" :min-width="flexWidth('person_finish_qty',tableData,'人员期末数量')"/>
<el-table-column prop="operatetime_start" label="开工时间" :min-width="flexWidth('operatetime_start',tableData,'开工时间')"/>
<el-table-column prop="operatetime_end" label="完工时间" />
<el-table-column prop="operatetime_start" label="开始时间" :min-width="flexWidth('operatetime_start',tableData,'开工时间')"/>
<el-table-column prop="operatetime_end" label="结束时间" />
<el-table-column prop="report_status" label="报工状态" >
<template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }}

40
mes/qd/src/views/wms/product_manage/workorder/index.vue
View File

@@ -368,11 +368,47 @@
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.is_used_fxx"
v-model="form.package_ext.is_used_fxx"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="包装模版" prop="package_model">
<el-input-number
v-model="form.package_ext.package_model"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="拆箱数量" prop="demol_num">
<el-input-number
v-model="form.package_ext.demol_num"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="demol_num">
<el-input-number
v-model="form.package_ext.demol_num"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="码盘模版" prop="stack_model">
<el-input-number
v-model="form.package_ext.stack_model"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -512,7 +548,7 @@ const defaultForm = {
device_code: null,
current_produce_person_id: null,
is_canupdate_update: null,
is_used_fxx: false,
package_ext: {},
workorder_status: null,
is_needmove: null,
sale_id: null,

4
mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
View File

@@ -94,8 +94,8 @@
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
<el-table-column prop="operatetime_start" label="开工时间" :min-width="flexWidth('operatetime_start',crud.data,'开工时间')"/>
<el-table-column prop="operatetime_end" label="完工时间" :min-width="flexWidth('operatetime_end',crud.data,'完工时间')"/>
<el-table-column prop="operatetime_start" label="开始时间" :min-width="flexWidth('operatetime_start',crud.data,'开始时间')"/>
<el-table-column prop="operatetime_end" label="完成时间" :min-width="flexWidth('operatetime_end',crud.data,'完成时间')"/>
<el-table-column prop="report_status" label="报工状态" >
<template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }}

4
mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue
View File

@@ -87,8 +87,8 @@
<el-input v-model="scope.row.repare_qty" /></template>
</el-table-column>
<el-table-column prop="person_finish_qty" label="人员期末数量" />
<el-table-column prop="operatetime_start" label="开工时间" />
<el-table-column prop="operatetime_end" label="完工时间" />
<el-table-column prop="operatetime_start" label="开始时间" />
<el-table-column prop="operatetime_end" label="结束时间" />
<el-table-column prop="report_status" label="报工状态">
<template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }}