zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:玻纤交接添加合批

This commit is contained in:
shijing 2025-03-12 13:48:58 +08:00
parent 825763f966
commit 510c9bed11
2 changed files with 116 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
src/views/wpm_bx/handover_form.vue
View File

@ -13,73 +13,14 @@
:rules="rules" :rules="rules"
label-width="80px" label-width="80px"
> >
<el-row> <el-row>
<el-col :md="12" :sm="24">
<el-form-item label="交送日期" prop="send_date">
<el-date-picker
v-model="form.send_date"
type="date"
placeholder="选择时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="交送人" prop="send_user">
<el-select
v-model="form.send_user"
placeholder="交送人"
clearable
filterable
style="width: 100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="更改批次">
<el-switch v-model="change_batch"></el-switch>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="type==50">
<el-form-item label="更改物料">
<xtSelect
:apiObj="apiObj"
:params="paramsM"
v-model="form.material_changed"
v-model:label="material_changed_name"
style="width:100%"
>
<el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="工序" prop="process_name"></el-table-column>
<el-table-column label="规格" prop="specification"></el-table-column>
</xtSelect>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="处理备注">
<el-input v-model="form.note" placeholder="处理备注"></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="change_batch">
<el-form-item label="新批次号" prop="new_batch">
<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="交接物料"> <el-form-item label="交接物料">
<el-button type="primary" @click="addMaterial" v-if="mode!=='show'">手动添加</el-button> <el-button type="primary" @click="addMaterial" v-if="mode!=='show'">手动添加</el-button>
<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog> <scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
</el-form-item> </el-form-item>
<el-form-item label="总计：">
{{ totalCount }}
</el-form-item>
</el-row> </el-row>
<el-row v-show="addShow"> <el-row v-show="addShow">
<el-col> <el-col>
@ -167,28 +108,37 @@
</div> </div>
</el-card> </el-card>
<el-row> <el-row>
<div class="total-count">总计：{{ totalCount }}</div> <el-col :md="12" :sm="24">
</el-row> <el-form-item label="交送日期" prop="send_date">
<el-row> <el-date-picker
<el-col :md="12" :sm="24" v-if="type==30"> v-model="form.send_date"
<el-form-item label="接收部门" prop="recive_dept"> type="date"
<el-select placeholder="选择时间"
v-model="form.recive_dept" format="YYYY-MM-DD"
placeholder="接收部门" value-format="YYYY-MM-DD"
clearable style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="交送人">
<el-select
v-model="form.send_user"
placeholder="交送人"
clearable
filterable
style="width: 100%" style="width: 100%"
@change="getUserList3"
> >
<el-option <el-option
v-for="item in deptOptions" v-for="item in userList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-else> <el-col :md="12" :sm="24">
<el-form-item label="接收工段" prop="recive_mgroup"> <el-form-item label="接收工段" prop="recive_mgroup">
<el-select <el-select
v-model="form.recive_mgroup" v-model="form.recive_mgroup"
@ -209,7 +159,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="接收人" prop="recive_user"> <el-form-item label="接收人">
<el-select <el-select
v-model="form.recive_user" v-model="form.recive_user"
placeholder="接收人" placeholder="接收人"
@ -226,6 +176,36 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24">
<el-form-item label="更改批次">
<el-switch v-model="change_batch"></el-switch>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="type==50">
<el-form-item label="更改物料">
<xtSelect
:apiObj="apiObj"
:params="paramsM"
v-model="form.material_changed"
v-model:label="material_changed_name"
style="width:100%"
>
<el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="工序" prop="process_name"></el-table-column>
<el-table-column label="规格" prop="specification"></el-table-column>
</xtSelect>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="处理备注">
<el-input v-model="form.note" placeholder="处理备注"></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="change_batch">
<el-form-item label="新批次号" prop="new_batch">
<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-footer v-if="mode!=='show'"> <el-footer v-if="mode!=='show'">
@ -361,11 +341,7 @@ export default {
that.form.type = that.type; that.form.type = that.type;
let materialObj = that.$TOOL.data.get("MATERIAL_OBJECT"); let materialObj = that.$TOOL.data.get("MATERIAL_OBJECT");
that.materialObj = materialObj; that.materialObj = materialObj;
let date = new Date(); that.form.handle_date =that.form.send_date =this.$TOOL.dateFormat2(new Date());
let year = date.getFullYear();
let month = date.getMonth() + 1;
let day = date.getDate();
that.form.handle_date = year + "-" + month + "-" + day;
that.form.send_mgroup = that.mgroupId; that.form.send_mgroup = that.mgroupId;
if(that.type==20||that.type==50){ if(that.type==20||that.type==50){
that.form.recive_mgroup = that.mgroupId; that.form.recive_mgroup = that.mgroupId;
@ -480,8 +456,21 @@ export default {
//获取交送工段人员 //获取交送工段人员
getUserList() { getUserList() {
let that = this; let that = this;
let userInfo = that.$TOOL.data.get("USER_INFO");
this.$API.system.user.list.req({ depts: that.deptID, page: 0 }).then((res) => { this.$API.system.user.list.req({ depts: that.deptID, page: 0 }).then((res) => {
that.userList = res; that.userList = res;
let arr = res.filter(item=>{
return item.id==userInfo.id;
})
if(arr.length>0){
that.form.send_user = userInfo.id;
}else{
let obj = {};
obj.id = userInfo.id;
obj.name = userInfo.name;
that.userList.push(obj)
that.form.send_user = userInfo.id;
}
}); });
}, },
//获取仓库人员 //获取仓库人员
@ -532,8 +521,10 @@ export default {
this.countChange(); this.countChange();
}, },
//显示 //显示
open(mode = "add") { open(mode = "add",data,mtype) {
this.mode = mode; this.mode = mode;
this.mtype = mtype;
this.form.handoverb = data;
this.visible = true; this.visible = true;
return this; return this;
}, },

50
src/views/wpm_bx/inm.vue
View File

@ -4,6 +4,7 @@
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'" v-if="mgroupName=='清洗'">领料</el-button> <el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'" v-if="mgroupName=='清洗'">领料</el-button>
<el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">报废</el-button> <el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">报废</el-button>
<el-button type="primary" v-auth="'handover.create'" @click="batchConcat()">合批</el-button>
<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'" v-if="mgroupName=='检测'">入库</el-button> <el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'" v-if="mgroupName=='检测'">入库</el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
@ -41,11 +42,13 @@
row-key="id" row-key="id"
:params="params" :params="params"
:query="query" :query="query"
@selection-change="selectionChange"
> >
<el-table-column label="状态" prop="state" width="100" > <el-table-column type="selection" width="50"></el-table-column>
<template #default="scope"> <el-table-column label="状态" prop="state" width="100" >
<el-tag :type="wmState[scope.row.state]?.type"> <template #default="scope">
{{wmState[scope.row.state]?.text}} <el-tag :type="wmState[scope.row.state]?.type">
{{wmState[scope.row.state]?.text}}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -56,9 +59,9 @@
> >
<template #default="scope"> <template #default="scope">
{{ scope.row.material_name }} {{ scope.row.material_name }}
<span v-if="scope.row.material_origin != null" <span v-if="scope.row.material_origin != null">
>（{{ scope.row.material_origin_name }}）</span （{{ scope.row.material_origin_name }}）
> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -366,7 +369,18 @@ export default {
}, },
//表格选择后回调事件 //表格选择后回调事件
selectionChange(selection) { selectionChange(selection) {
this.selection = selection; let that = this;
that.selection = selection;
//合批
if(selection.length>0){
let material = selection[0].material;
selection.forEach((item)=>{
if(item.material!==material){
that.$refs.table.toggleRowSelection(item, false);
that.$message.warning("该批次物料与前面的不一样");
}
})
}
}, },
//添加报废 //添加报废
table_add(type) { table_add(type) {
@ -376,6 +390,26 @@ export default {
this.$refs.scrapDialog.open("add"); this.$refs.scrapDialog.open("add");
}); });
}, },
//合批
batchConcat(){
this.changebatch = true;
let handoverb = [];
if(this.selection.length>0){
this.selection.forEach(item=>{
let obj = {};
obj.wm = item.id;
obj.batch = item.batch;
obj.count_cando = item.count_cando;
obj.count = item.count_cando;
handoverb.push(obj)
})
}
this.type = 10;
this.dialog.scrap = true;
this.$nextTick(() => {
this.$refs.scrapDialog.open("add",handoverb,30);
});
},
handleScrapSuccess(){ handleScrapSuccess(){
this.dialog.scrap = false; this.dialog.scrap = false;
this.$refs.table.refresh(); this.$refs.table.refresh();