Teams/kunshan-bzfm-pda-uniapp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

报工优化

Browse Source
This commit is contained in:
赵正易
2024-12-23 14:01:18 +08:00
parent 5e9927b1bf
commit e90d789686
4 changed files with 84 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pages/index.vue
View File

@@ -133,15 +133,15 @@ export default {
processName: '入库检查'
}
},
{
name: '出厂',
icon: 'redo-filled',
url: '/pages/produceManagement/process/process',
params: {
processId: 80,
processName: '出厂'
}
},
// {
// name: '出厂',
// icon: 'redo-filled',
// url: '/pages/produceManagement/process/process',
// params: {
// processId: 80,
// processName: '出厂'
// }
// },
{
name: '出货',
icon: 'upload-filled',

30
pages/produceManagement/process/process.vue
View File

@@ -30,12 +30,12 @@
<u-form-item label="不良数量" borderBottom>
<u--input class="input-border" v-model.number="formData.badNum" type="number"></u--input>
</u-form-item>
<!-- <u-form-item label="报工人" borderBottom>
<u--input class="input-border" v-model="formData.worker"></u--input>
</u-form-item> -->
<u-form-item v-if="processName === '出货'" label="客户定单">
<u--input class="input-border" v-model="formData.customerOrder"></u--input>
</u-form-item>
<u-form-item label="作业员" borderBottom>
<u--input class="input-border" v-model="formData.worker"></u--input>
</u-form-item>
</u-form>
</uni-card>
@@ -170,7 +170,6 @@ export default {
this.formData.finishNum = res2.data.finishNum;
this.formData.badNum = res2.data.badNum;
this.formData.worker = res2.data.worker;
console.log(res2.data);
if (this.formData.finishNum > 0) {
this.uModal.title = '报工提醒';
this.uModal.content = '此工序该工单已报工过！';
@@ -209,7 +208,7 @@ export default {
const _badNum = this.formData.badNum * 1;
if (_planNum !== _finishNum + _badNum) {
this.uModal.title = '报工填写异常';
this.uModal.content = '前工序数量不等于完成数量加不良数量，请检查！';
this.uModal.content = '计划数量不等于完成数量加不良数量，请检查！';
this.openModal();
return false;
}
@@ -218,6 +217,21 @@ export default {
return false;
}
},
checkInput(){
if(!(this.formData.finishNum > -1)){
this.uModal.title = '参数未填写提醒';
this.uModal.content = '完成数必填';
this.openModal();
return false;
}
if(!this.formData.worker){
this.uModal.title = '参数未填写提醒';
this.uModal.content = '作业人必填';
this.openModal();
return false;
}
return true;
},
modalConfirm() {
const params = {
workorder: this.formData.workorder,
@@ -226,8 +240,12 @@ export default {
finish_num: this.formData.finishNum,
bad_num: this.formData.badNum ?? 0,
customer_order:this.formData.customerOrder,
worker: this.formData.worker
process_operator: this.formData.worker
};
if(!this.checkInput()){
this.uModal2.show = false;
return;
}
if(this.processName === '出货'){
reportWorkOrderApi.ShipmentProcessReportwork(params).then((res) => {
if (res.code === 200) {

11
pages/produceManagement/reportWorkOrderList/reportWorkOrderList.vue
View File

@@ -4,7 +4,7 @@
<ScanInput @scanConfirm="scanConfirm" placeholder="请扫标签,查看报工信息"></ScanInput>
</uni-card>
<!-- 工单信息 -->
<uni-card v-if="formData.workorder">
<u-text text="工单信息" bold size="20"></u-text>
<u-form labelPosition="left" ref="uForm" labelWidth="100">
@@ -48,7 +48,6 @@
<u-form-item label="材质" borderBottom>
<u-input readonly v-model="formData.materialtextureCode" border="none"></u-input>
</u-form-item>
</u-form>
</uni-card>
<!-- 报工清单 -->
@@ -56,11 +55,15 @@
<u-text text="报工清单" bold size="20"></u-text>
<u-list>
<u-list-item v-for="(item, index) in formReportList" :key="index">
<u-cell :title="item.processName" :label="`作业员:${item.worker}\n提交时间:${item.jobDate}`" :value="`完成数:${item.finishNum}\n不良数:${item.badNum}`"></u-cell>
<u-cell
:title="item.processName"
:label="`作业员:${item.worker}\n提交时间:${item.jobDate}`"
:value="`完成数:${item.finishNum | 0}\n不良数:${item.badNum | 0}`"
></u-cell>
</u-list-item>
</u-list>
</uni-card>
<!-- 消息提示 -->
<u-modal :show="uModal.show" :title="uModal.title" :content="uModal.content" @confirm="closeModal"></u-modal>
</view>

57
pages/produceManagement/requisition/requisition.vue
View File

@@ -39,15 +39,15 @@
<u-form-item label="实际领料数" borderBottom>
<u--input class="input-border" v-model.number="formData.finishNum" type="number"></u--input>
</u-form-item>
<!-- <u-form-item label="领料人" borderBottom>
<u--input class="input-border" v-model="formData.worker"></u--input>
</u-form-item> -->
<u-form-item label="炉号" borderBottom>
<u--input class="input-border" v-model="formData.stoveCode"></u--input>
</u-form-item>
<u-form-item label="进料单" borderBottom>
<u--input class="input-border" v-model="formData.feedOrder"></u--input>
</u-form-item>
<u-form-item label="作业员" borderBottom>
<u--input class="input-border" v-model="formData.worker"></u--input>
</u-form-item>
</u-form>
</uni-card>
<!-- 其他信息 -->
@@ -155,7 +155,8 @@ export default {
// 扫工单码结果
scanConfirm(val) {
const params = {
workorder: val
workorder: val,
processId: this.processId
};
reportWorkOrderApi.GetWorkOrderDetail(params).then((res) => {
if (res.code === 200) {
@@ -166,14 +167,25 @@ export default {
return;
}
this.formData = res.data;
this.formData.finishNum = res.data.planNum;
// if (this.formData.finishNum > 0) {
// this.uModal.title = '报工提醒';
// this.uModal.content = '该工单已领料过！';
// this.openModal();
// }
reportWorkOrderApi.GetProcessReportWorkDetail(params).then((res2) => {
if (!res2.data) {
this.formData.finishNum = 0;
this.formData.badNum = 0;
this.formData.worker = '';
} else {
this.formData.finishNum = res2.data.finishNum ?? 0;
this.formData.badNum = res2.data.badNum ?? 0;
this.formData.worker = res2.data.worker;
if (this.formData.finishNum > 0) {
this.uModal.title = '报工提醒';
this.uModal.content = '此工序该工单已报工过！';
this.openModal();
}
}
});
}
});
},
// 检查工序顺序
checkProcessSort() {
@@ -204,6 +216,21 @@ export default {
this.uModal2.content = '是否确认领料';
this.uModal2.show = true;
},
checkInput(){
if(!(this.formData.finishNum >= 0)){
this.uModal.title = '参数未填写提醒';
this.uModal.content = '实际领料数必填';
this.openModal();
return false;
}
if(!this.formData.worker){
this.uModal.title = '参数未填写提醒';
this.uModal.content = '作业人必填';
this.openModal();
return false;
}
return true;
},
modalConfirm() {
const params = {
workorder: this.formData.workorder,
@@ -211,10 +238,14 @@ export default {
bad_num: 0,
// 参数填写
finish_num: this.formData.finishNum,
feed_order:this.formData.feedOrder,
stove_code:this.formData.stoveCode,
worker: this.formData.worker
feed_order: this.formData.feedOrder,
stove_code: this.formData.stoveCode,
process_operator: this.formData.worker
};
if(!this.checkInput()){
this.uModal2.show = false;
return;
}
reportWorkOrderApi.FeedProcessReportwork(params).then((res) => {
if (res.code === 200) {
this.uModal2.show = false;