Skip to content

M
mes-pad
Commit d824f7d5 authored by 李驰骋's avatar 李驰骋
Browse files
Options

物料回退申请单调整

parent 14577566
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 17 deletions
pages/mes/prodReport/index.vue
View file @ d824f7d5
......@@ -155,7 +155,7 @@
</u-radio-group>
</view>
</u-form-item>
</u-col>
</u-row>
</u-form>
......@@ -218,7 +218,7 @@
<u-input :border="true" v-model="ExceptionForms.abnormalTime"></u-input>
<uni-datetime-picker class="times" type="date" :clear-icon="false" v-model="ExceptionForms.abnormalTime" />
</u-form-item> -->
<u-row>
<u-col span="6">
<u-form-item label="异常类型" prop="abnormalType">
......@@ -363,17 +363,33 @@
<u-modal title="退料申请" @confirm="materialReturnSave()" show-cancel-button
:title-style="{'background-color':'#1E3770','color': '#FFFFFF' ,'line-height': '37px','padding-top': '0px'}"
v-model="materialReturnVisible" width="1300rpx">
v-model="materialReturnVisible" width="1600rpx">
<view class="list-bar">
<u-form label-width="100px">
<u-row>
<u-col span="6">
<u-form-item label="编排单号">
{{curTaskInfo.arrangeCode}}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="生产工单" prop="workorderCode">
<uni-data-select @change="materialReturnWorkorderChange" :localdata="curTaskInfo.workorderOption"></uni-data-select>
</u-form-item>
</u-col>
</u-row>
</u-form>
<scroll-view scroll-y="true" class="scroll-list" :style="{ 'height': (this.screenHeight -280) + 'px' }">
<uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
<uni-tr>
<uni-th width="100px" align="center">操作</uni-th>
<uni-th width="60px" align="center">操作</uni-th>
<uni-th width="110px" align="center">产品物料编码</uni-th>
<uni-th width="110px" align="center">产品物料名称</uni-th>
<uni-th width="80px" align="center">领料数量</uni-th>
<uni-th width="80px" align="center">退料数量</uni-th>
<uni-th width="80px" align="center">本次退料数</uni-th>
<uni-th width="80px" align="center">累计退料数</uni-th>
<uni-th width="110px" align="center">批次号</uni-th>
<uni-th width="60" align="center">合格</uni-th>
</uni-tr>
<uni-tr v-for="(line,index) in materialReturnList" :key="index">
<uni-td align="center">
......@@ -386,7 +402,9 @@
<uni-td align="center">{{ line.itemName }}({{line.specification}})/{{line.unitOfMeasure}}</uni-td>
<uni-td align="center">{{ line.quantityIssued }}</uni-td>
<uni-td align="center">{{ line.applyNum }}</uni-td>
<uni-td align="center">{{ line.totalBackNum }}</uni-td>
<uni-td align="center">{{ line.batchCode }}</uni-td>
<uni-td align="center">{{ line.isQualified==1?'是':'' }}{{ line.isQualified==0?'否':'' }}</uni-td>
</uni-tr>
</uni-table>
</scroll-view>
......@@ -395,7 +413,7 @@
<u-modal title="退料申请数量" @confirm="materialReturnSetting()" show-cancel-button
:title-style="{'background-color':'#1E3770','color': '#FFFFFF' ,'line-height': '37px','padding-top': '0px'}"
v-model="materialReturn" width="700rpx">
v-model="materialReturnFormVisible" width="700rpx">
<view class="">
<u-form label-width="100px">
<u-row>
......@@ -412,6 +430,22 @@
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col>
<u-form-item label="是否合格" prop="printName">
<view class="uni-list-item__extra">
<u-radio-group v-model="materialReturnFormData.isQualified">
<u-radio name="1">
是
</u-radio>
<u-radio name="0">
否
</u-radio>
</u-radio-group>
</view>
</u-form-item>
</u-col>
</u-row>
</u-form>
</view>
</u-modal>
......@@ -464,7 +498,7 @@
<view >
<image v-for="(line,index) in viewSop" class="u-avatar-demo" :src="line" mode="aspectFill"></image>
</view>
</view>
</scroll-view>
</view>
</u-modal>
......@@ -755,7 +789,8 @@ export default {
materialRequestSelected:{},
materialReturnFormData: {
itemName:null,
applyNum:null
applyNum:null,
workorderCode:null
},
materialReturnFormVisible:false,
materialReturnSelected:{},
......@@ -995,9 +1030,9 @@ export default {
const items= row.workorderList.find(item => item.value === id)
console.log(items, 'items')
row.workorderCode = items.text
row.printName = items.text
row.printName = items.text
},
stopReas(abnormalType) {
this.ExceptionForms.abnormalType = abnormalType
// 查询原因
......@@ -1029,7 +1064,7 @@ export default {
})
})
},
getTaskList() {
this.form = {}
const t = this;
......@@ -1148,8 +1183,8 @@ export default {
this.feedbackForms.push(feedback)
})
this.open = true;
},
doException() {
......@@ -1170,7 +1205,7 @@ export default {
})
this.aopen = true;
},
async newlyAddss(){
const res = await this.$u.api.abnormal.newlyAdd(this.ExceptionForms);
this.getTaskList();
......@@ -1354,6 +1389,10 @@ export default {
const t = this;
this.materialReturnVisible=true;
const taskInfo = this.tableSelectData[0];
this.curTaskInfo = this.tableSelectData[0];
this.curTaskInfo.workorderOption = this.curTaskInfo.proWorkorderList.map(s=>{
return {"value":s.workorderCode,"text":s.workorderCode};
});
this.$u.api.listMaterialReturn({"taskId":taskInfo.taskId}).then(res => {
if (res.code === 200) {
t.materialReturnList = res.data;
......@@ -1369,10 +1408,16 @@ export default {
}
});
},
materialReturnWorkorderChange(s){
this.materialReturnFormData.workorderCode=s;
},
materialReturnFormShow(line){
this.materialReturnFormVisible=true;
this.materialReturnFormData = {itemName: line.itemName};
this.materialReturnFormData = {
itemName: line.itemName,
orkorderCode:this.materialReturnFormData.workorderCode,
isQualified:1
};
this.materialReturnSelected = line;
},
viewSopsShow(row){
......@@ -1387,6 +1432,7 @@ export default {
},
materialReturnSetting(){
this.materialReturnSelected.applyNum = this.materialReturnFormData.applyNum;
this.materialReturnSelected.isQualified =this.materialReturnFormData.isQualified;
this.materialReturnFormVisible=false;
},
materialReturnSave(){
......@@ -1402,7 +1448,9 @@ export default {
"issueLineId":s.lineId,
"workOrderId":s.workorderId,
"batchNo":s.batchCode,
"packNo":s.packNo
"packNo":s.packNo,
"isQualified":s.isQualified,
"workorderCode":t.materialReturnFormData.workorderCode,
});
}
});
......
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