suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报工详情调整

Browse Source
dev-scheduling
zhangdi 2 months ago
parent 515c965d42
commit 0cdf99040e
3 changed files with 135 additions and 170 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      src/api/productionManagement/workReportingManagement.js
  2. 175
      src/views/productionManagement/js/wordReporting.js
  3. 99
      src/views/productionManagement/workReportingManagement.vue

31
src/api/productionManagement/workReportingManagement.js
Unescape View File

@ -12,7 +12,7 @@ export const getList = (params) => {
//报工记录接口 //报工记录接口
export const getRecordList = (params) => { export const getRecordList = (params) => {
return request({ return request({
url: '/blade-desk/order/plateGoodsApply/page', url: '/blade-desk/disTasking/workPlanLogPage',
method: 'get', method: 'get',
params params
}); });
@ -21,8 +21,35 @@ export const getRecordList = (params) => {
// 扫描流程卡号获取数据 // 扫描流程卡号获取数据
export const getDataByCardNo = (params) => { export const getDataByCardNo = (params) => {
return request({ return request({
url: '/blade-desk/order/plateGoodsApply/getByCardNo', url: '/blade-desk/disTasking/getByCardNoByPlan',
method: 'get', method: 'get',
params params
}); });
}; };
// 报工调整详情
export const getDataByWpId = (params) => {
return request({
url: '/blade-desk/disTasking/queryByWpIdlLst',
method: 'get',
params
});
};
//报工调整-保存
export const uploadPlan = (params) => {
return request({
url: '/blade-desk/disTasking/uploadPlan',
method: 'post',
params
});
};
// 报工调整-转班
export const shiftTransfer = (params) => {
return request({
url: '/blade-desk/disTasking/shiftTransfer',
method: 'post',
params
});
};

175
src/views/productionManagement/js/wordReporting.js
Unescape View File

@ -6,13 +6,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入车间订单',
trigger: 'blur',
},
],
}, },
{ {
label: '流程卡号', label: '流程卡号',
@ -20,13 +14,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入流程卡号',
trigger: 'blur',
},
],
}, },
{ {
label: '零件号', label: '零件号',
@ -34,13 +22,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入零件号',
trigger: 'blur',
},
],
}, },
{ {
label: '批次号', label: '批次号',
@ -48,13 +30,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入批次号',
trigger: 'blur',
},
],
}, },
{ {
label: '当前工序', label: '当前工序',
@ -62,13 +38,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入当前工序',
trigger: 'blur',
},
],
}, },
{ {
label: '数量', label: '数量',
@ -76,27 +46,16 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入数量',
trigger: 'blur',
},
],
}, },
{ {
label: '班组', label: '班组',
prop: 'oriMakeTeam', prop: 'tsId',
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [ cell:true
{
required: true,
message: '请输入班组',
trigger: 'blur',
},
],
}, },
{ {
label: '现接收人', label: '现接收人',
@ -104,13 +63,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入现接收人',
trigger: 'blur',
},
],
}, },
{ {
label: '报工人详情', label: '报工人详情',
@ -118,13 +71,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入报工人详情',
trigger: 'blur',
},
],
}, },
], ],
'workReportingLog': [ 'workReportingLog': [
@ -134,13 +81,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入车间订单',
trigger: 'blur',
},
],
}, },
{ {
label: '流程卡号', label: '流程卡号',
@ -148,13 +89,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入流程卡号',
trigger: 'blur',
},
],
}, },
{ {
label: '零件号', label: '零件号',
@ -162,13 +97,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入零件号',
trigger: 'blur',
},
],
}, },
{ {
label: '批次号', label: '批次号',
@ -176,13 +105,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入批次号',
trigger: 'blur',
},
],
}, },
{ {
label: '当前工序', label: '当前工序',
@ -190,13 +113,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入当前工序',
trigger: 'blur',
},
],
}, },
{ {
label: '数量', label: '数量',
@ -204,13 +121,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入数量',
trigger: 'blur',
},
],
}, },
{ {
label: '原班组', label: '原班组',
@ -218,27 +129,15 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入原班组',
trigger: 'blur',
},
],
}, },
{ {
label: '现班组', label: '现班组',
prop: 'tsName', prop: 'makeTeam',
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入现班组',
trigger: 'blur',
},
],
}, },
{ {
label: '原接收人', label: '原接收人',
@ -246,27 +145,15 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入原接收人',
trigger: 'blur',
},
],
}, },
{ {
label: '现接收人', label: '现接收人',
prop: 'userName', prop: 'receiveMan',
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入现接收人',
trigger: 'blur',
},
],
}, },
{ {
label: '调整人', label: '调整人',
@ -274,13 +161,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入调整人',
trigger: 'blur',
},
],
}, },
{ {
label: '调整时间', label: '调整时间',
@ -288,13 +169,7 @@ export default {
span: 24, span: 24,
overflow: true, overflow: true,
search: false, search: false,
rules: [
{
required: true,
message: '请输入调整时间',
trigger: 'blur',
},
],
}, },
] ]
} }

99
src/views/productionManagement/workReportingManagement.vue
Unescape View File

@ -25,11 +25,15 @@
<template #menu-left v-if="tabPosition == 'workReporting'"> <template #menu-left v-if="tabPosition == 'workReporting'">
<el-form :inline="true" v-model="searchForm"> <el-form :inline="true" v-model="searchForm">
<el-form-item> <el-form-item>
<el-input placeholder="请扫描流程卡号" @input="handleSearchInput"></el-input> <el-input
v-model="searchForm.cardNo"
placeholder="请扫描流程卡号"
@keyup.enter.native="handleSearchInput"
></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary">保存</el-button> <el-button type="primary" @click="saveUpdate" :loading="saveLoading">保存</el-button>
<el-button type="primary" @click="changeTeam">转班</el-button> <el-button type="primary" @click="changeTeam" :loading="saveLoading">转班</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
@ -47,7 +51,7 @@
<el-table :data="tableData" style="margin-top: 20px"> <el-table :data="tableData" style="margin-top: 20px">
<el-table-column label="数量" prop="workQty"></el-table-column> <el-table-column label="数量" prop="workQty"></el-table-column>
<el-table-column label="报工时间" prop="makeTime"></el-table-column> <el-table-column label="报工时间" prop="makeTime"></el-table-column>
<el-table-column label="报工人" prop="worker.userId"></el-table-column> <el-table-column label="报工人" prop="worker"></el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
<!-- 转班 --> <!-- 转班 -->
@ -56,14 +60,18 @@
<el-form-item> 旧班组:{{ data[0].prWorkOrder.makeTeam.tsName }} </el-form-item> <el-form-item> 旧班组:{{ data[0].prWorkOrder.makeTeam.tsName }} </el-form-item>
<el-form-item label="新班组" prop="makeTeam"> <el-form-item label="新班组" prop="makeTeam">
<el-select v-model="teamForm.makeTeam"> <el-select v-model="teamForm.makeTeam">
<el-option label="班组一" value="1"></el-option> <el-option
v-for="(item,index) in teamSetList"
:label="item.tsName"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="teamDialog = false">取 消</el-button> <el-button @click="teamDialog = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button> <el-button type="primary" @click="submit" :loading="saveLoading">确 定</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -73,15 +81,26 @@
<script> <script>
import wordReporting from './js/wordReporting'; import wordReporting from './js/wordReporting';
import workReportingData from './js/workReportingData'; import workReportingData from './js/workReportingData';
import { getList, getRecordList } from '@/api/productionManagement/workReportingManagement'; import { getTeamSetList } from '@/api/processManagement/taskProcessing';
import {
getList,
getRecordList,
getDataByCardNo,
getDataByWpId,
uploadPlan,
} from '@/api/productionManagement/workReportingManagement';
export default { export default {
data() { data() {
return { return {
saveLoading: false,
tabPosition: 'workReporting', tabPosition: 'workReporting',
loading: false, loading: false,
data: [], data: [],
form: {}, form: {},
searchForm: {
cardNo: '',
},
detailDialog: false, detailDialog: false,
teamDialog: false, teamDialog: false,
teamForm: {}, teamForm: {},
@ -135,6 +154,7 @@ export default {
searchMenuPosition: 'right', searchMenuPosition: 'right',
column: [], column: [],
}, },
teamSetList: [], //班组列表
}; };
}, },
mounted() { mounted() {
@ -142,43 +162,86 @@ export default {
this.option.column = wordReporting[this.tabPosition]; this.option.column = wordReporting[this.tabPosition];
}, },
methods: { methods: {
// 获取班组列表
getTeamSetList() {
getTeamSetList().then(res => {
this.teamSetList = res.data.data;
});
},
// 扫描流程卡号 获取数据 // 扫描流程卡号 获取数据
handleSearchInput(key, value) {}, handleSearchInput(key, value) {
getDataByCardNo({ cardNo: this.searchForm.cardNo }).then(res => {
this.data = res.data.data.record;
});
},
// 保存
saveUpdate() {
this.saveLoading = true;
uploadPlan()
.then(res => {
this.saveLoading = false;
// this.option.column = wordReporting[this.tabPosition];
})
.catch(err => {
this.saveLoading = false;
});
},
// tab切换
tabPositionChange() { tabPositionChange() {
this.option.column = wordReporting[this.tabPosition]; this.option.column = wordReporting[this.tabPosition];
this.onLoad(); this.onLoad();
this.page.total = this.data.length; this.page.total = this.data.length;
}, },
handleDetail() { // 报工人详情
handleDetail(row) {
this.detailDialog = true; this.detailDialog = true;
getDataByWpId({ wpId: row.wpId }).then(res => {
// this.detailData = res.data.data
});
}, },
// 转班
changeTeam() { changeTeam() {
this.teamDialog = true; this.teamDialog = true;
}, },
// 转班保存
submit() { submit() {
this.$refs.teamForm.validate(valid => { this.$refs.teamForm.validate(valid => {
if (valid) { if (valid) {
this.teamDialog = false; this.saveLoading = true;
shiftTransfer({
woId: this.woId,
oldTsId: this.teamForm.tsId,
newTsId: this.teamForm.tsId,
})
.then(res => {
this.saveLoading = false;
this.teamDialog = false;
})
.catch(err => {
this.teamDialog = false;
this.saveLoading = false;
});
} }
}); });
}, },
// 页面切换获取数据
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
if (this.tabPosition == 'workReporting') { if (this.tabPosition == 'workReporting') {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data.records; // this.data = res.data.data.records;
this.loading = false; // this.loading = false;
this.page.total = res.data.data.total; // this.page.total = res.data.data.total;
this.option.selection = true // this.option.selection = true;
this.selectionClear(); // this.selectionClear();
}); // });
} else { } else {
getRecordList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( getRecordList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
res => { res => {
this.data = res.data.data.records; this.data = res.data.data.records;
this.loading = false; this.loading = false;
this.page.total = res.data.data.total; this.page.total = res.data.data.total;
this.option.selection = false this.option.selection = false;
} }
); );
} }

Write Preview
Loading…
Cancel
Save