Skip to content

M
mes-ui
Commit 80081a25 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

增加雇员数量

parent 764da0c8
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 105 deletions
src/views/mes/pro/productionSolution/components/ProogingBom.vue
View file @ 80081a25
......@@ -62,6 +62,7 @@
/>
</template>
</el-table-column>
<el-table-column label="雇员数量" align="center" prop="employeesNum" />
<el-table-column label="标准用量" align="center" prop="quantity" />
<el-table-column label="基本用量" align="center" prop="basicQuantity" />
<el-table-column label="BOM行备注" align="center" prop="bomItemRemark" />
......
src/views/mes/pro/scheduleList/workunitSelectSche.vue
View file @ 80081a25
......@@ -17,6 +17,7 @@
<el-form-item label="工作单元编码" prop="workunitCode">
<el-input
v-model="queryParams.workunitCode"
disabled
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
......@@ -25,13 +26,14 @@
<el-form-item label="工作单元名称" prop="workunitName">
<el-input
v-model="queryParams.workunitName"
disabled
placeholder="请输入工作单元名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作中心" prop="workstationId">
<el-select filterable v-model="queryParams.workstationId" placeholder="请选择工作中心" clearable @change="getList">
<el-select filterable v-model="queryParams.workstationId" disabled placeholder="请选择工作中心" clearable @change="getList">
<el-option
v-for="dict in workstationList"
:key="dict.workstationId"
......
src/views/mes/pro/workorder/indexApply.vue
View file @ 80081a25
......@@ -89,8 +89,8 @@
<el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="排版状态" prop="dtaAction">
<el-select v-model="queryParams.dtaAction" placeholder="请选择排版状态" clearable>
<el-form-item label="排版状态" prop="dtaActions">
<el-select v-model="queryParams.dtaActions" placeholder="请选择排版状态" clearable multiple>
<el-option v-for="dict in dict.type.dta_action" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
......@@ -822,7 +822,7 @@ export default {
pageSize: 50,
workorderCodes: null,
arrangeCodes: null,
dtaAction: null,
dtaActions: [],
complate: null,
workorderName: null,
orderSource: null,
......@@ -1615,6 +1615,7 @@ export default {
params.workorderCodes = this.selectedRows.map(item => item.workorderCode)
}
params.statusArr = params.statusArr.length > 0 ? params.statusArr : null;
params.dtaActions = params.dtaActions.length > 0 ? params.dtaActions : null;
delete params.pageNum;
delete params.pageSize;
this.download1(
......
src/views/mes/proTable/productProcess/index.vue
View file @ 80081a25
......@@ -86,10 +86,9 @@
<el-table-column :label="'标准工时'" align="center" prop="stdWorkingTime"></el-table-column>
<el-table-column :label="'实际工时'" align="center" prop="machineTime">
<template slot-scope="scope">
{{scope.row['machineTime'] ? Number(scope.row['machineTime']).toFixed(2) : scope.row['machineTime']}}
{{scope.row['machineTime'] ? Number(scope.row['machineTime']).toFixed(3) : scope.row['machineTime']}}
</template>
</el-table-column>
<el-table-column :label="'报工时间'" align="center" prop="feedbackTime"></el-table-column>
</el-table>
</div>
......
src/views/mes/proTable/productSee/index.vue
View file @ 80081a25
<template>
<div class="app-container">
<div class="app-container mys-container">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="销售订单" prop="salesVoucher">
<el-input
......@@ -84,24 +84,29 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="tbodys" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="tbodys" @selection-change="handleSelectionChange" @row-click="mainTableClick" :height="tableHeight" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="销售订单" align="center" width="150px" prop="salesVoucher" >
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
>{{scope.row.salesVoucher}}</el-button>
</template>
</template> -->
</el-table-column>
<el-table-column label="订单项次" align="center" prop="salesVoucherItem" />
<el-table-column label="编排单号" align="center" prop="arrangeCode" />
<el-table-column label="工单号" align="center" prop="workorderCode" />
<el-table-column label="条码" align="center" prop="barcode" />
<el-table-column label="入库时间" align="center" prop="warehouseTime" />
<el-table-column label="入库时间" align="center" prop="warehouseTime" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.warehouseTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="产品编码" align="center" prop="productCode" />
<el-table-column label="产品名称" align="center" prop="productName" />
<el-table-column label="数量" align="center" prop="quantity" />
<el-table-column label="数量" align="center" prop="packageNum" />
<el-table-column label="装箱分组码" align="center" prop="blGroup" />
<el-table-column label="装箱码" align="center" prop="boxCode" />
<el-table-column label="SIZE明细" align="center" prop="boxCode" >
<template slot-scope="scope">
......@@ -120,6 +125,17 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div class="second-box" v-if="isShowSecond">
<el-table v-loading="loadingLeft" :data="tbodysLeft" border>
<el-table-column :label="'工作中心'" align="center" prop="workstation_name"></el-table-column>
<el-table-column :label="'工作单元'" align="center" prop="workunit_name"></el-table-column>
<el-table-column :label="'报工人员'" align="center" prop="create_by"></el-table-column>
<el-table-column :label="'标准工时'" align="center" prop="std_working_time">
</el-table-column>
<el-table-column :label="'实际工时'" align="center" prop="machine_time"></el-table-column>
<el-table-column :label="'报工时间'" align="center" prop="create_time"></el-table-column>
</el-table>
</div>
<!-- 添加或修改生产领料单头对话框 -->
<el-dialog :title="title" :visible.sync="openSIZE" width="960px" append-to-body>
......@@ -130,51 +146,6 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="工作中心" prop="workstation_name">
<el-input v-model="form.workstation_name" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作单元" prop="workunit_name">
<el-input v-model="form.workunit_name" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报工人员" prop="create_by">
<el-input v-model="form.create_by" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准工时" prop="std_working_time">
<el-input v-model="form.std_working_time" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际工时" prop="machine_time">
<el-input v-model="form.machine_time" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报工时间" prop="create_time">
<el-date-picker clearable
v-model="form.create_time"
disabled
type="date"
value-format="yyyy-MM-dd"
placeholder="">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -215,8 +186,8 @@
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
openSIZE: false,
tableHeight: 0,
// 查询参数
queryParams: {
pageNum: 1,
......@@ -226,7 +197,7 @@
issueName: null,
workstationId: null,
workstationCode: null,
workorderId: null,
barcode: null,
workorderCode: null,
taskId: null,
taskCode: null,
......@@ -243,6 +214,10 @@
salesVoucherItem: null,
barcode: null
},
highlightRow: null,
tbodysLeft: [],
loadingLeft: false,
isShowSecond: false,
sizeItems: [],
// 表单参数
form: {
......@@ -253,9 +228,45 @@
},
created() {
this.getList();
this.getWarehouseList();
},
mounted(){
this.$nextTick(()=>{
this._resizeHandler()
})
this._resizeHandler = () => {
this.tableHeight = (window.innerHeight / 2) - 120
}
window.addEventListener('resize', this._resizeHandler)
},
beforeDestroy() {
window.removeEventListener('resize', this._resizeHandler)
},
methods: {
// 取消按钮
cancel() {
this.open = false;
this.openSIZE = false
this.reset();
},
tableRowClassName({ row, rowIndex }) {
if(!row.barcode || !this.highlightRow) return ''
// 如果当前行是高亮行，则添加特定的类名
if (row.barcode === this.highlightRow.barcode) {
return 'highlight-row';
}
return '';
},
mainTableClick(row){
this.loadingLeft = true;
this.highlightRow = row;
if (row.feedback) {
this.tbodysLeft = [row.feedback]
} else {
this.tbodysLeft = []
}
this.loadingLeft = false;
this.isShowSecond = true
},
/** 查询生产领料单头列表 */
getList() {
this.loading = true;
......@@ -275,31 +286,6 @@
this.loading = false;
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
this.warehouseOptions = JSON.parse(ostr);
});
},
// 取消按钮
cancel() {
this.open = false;
this.openSIZE = false
this.reset();
},
// 表单重置
reset() {
this.form = {
......@@ -309,7 +295,7 @@
workstationId: null,
workstationCode: null,
workstationName: null,
workorderId: null,
barcode: null,
workorderCode: null,
workorderName: null,
clientId:null,
......@@ -379,22 +365,6 @@
this.openSIZE = true;
this.title = "查看SIZE明细";
},
handleView(row){
if (!row.feedback) {
this.form = {
workstation_name: '',
workunit_name: '',
create_by: '',
std_working_time: '',
machine_time: '',
create_time: ''
}
} else {
this.form = row.feedback
}
this.open = true;
this.title = "查看";
},
/** 导出按钮操作 */
handleExport() {
let params = {}
......@@ -419,4 +389,16 @@
}
};
</script>
\ No newline at end of file
<style lang="scss" scoped>
.mys-container {
.pagination-container {
padding: 0px 20px !important;
}
::v-deep .highlight-row {
background-color: #e5eeff !important;
td {
background-color: #e5eeff !important;
}
}
}
</style>
\ No newline at end of file
src/views/mes/proTable/supplementaryOrder/index.vue
View file @ 80081a25
......@@ -59,7 +59,7 @@
<el-table-column :label="item.label" align="center" :prop="item.value" :width="item.width" v-for="(item, index) in theaders" :key="index">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" v-if="item.value==='workorderType'" />
<div v-else>{{ item.value === 'machineTime' ? scope.row[item.value] ? Number(scope.row[item.value]).toFixed(2) : scope.row[item.value] : scope.row[item.value] }}</div>
<div v-else>{{ item.value === 'machineTime' ? scope.row[item.value] ? Number(scope.row[item.value]).toFixed(3) : scope.row[item.value] : scope.row[item.value] }}</div>
</template>
</el-table-column>
</el-table>
......@@ -82,7 +82,7 @@
<el-table-column :label="item.label" align="center" :prop="item.value" v-for="(item, index) in theaders" :key="index">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" v-if="item.value==='workorderType'" />
<div v-else>{{ item.value === 'machineTime' ? scope.row[item.value] ? Number(scope.row[item.value]).toFixed(2) : scope.row[item.value] : scope.row[item.value] }}</div>
<div v-else>{{ item.value === 'machineTime' ? scope.row[item.value] ? Number(scope.row[item.value]).toFixed(3) : scope.row[item.value] : scope.row[item.value] }}</div>
</template>
</el-table-column>
</el-table>
......
src/views/system/user/profile/workunitSelect.vue
View file @ 80081a25
......@@ -105,6 +105,8 @@ export default {
this.selectedRows = []
this.queryParams.workstationName = this.workstationName;
this.queryParams.workstationId = this.workstationId;
this.queryParams.workunitName = ''
this.queryParams.workunitCode = ''
this.getList();
},
immediate: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment