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

fix: 车间库存显示count__gte

This commit is contained in:
caoqianming 2023-12-25 13:09:19 +08:00
parent eee2fb8372
commit 02162eb83e
4 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/wpm/mlog_dept10.vue
View File

@ -360,6 +360,7 @@ export default {
this.apiObjHandover = this.$API.wpm.handover.list
this.paramsWm.belong_dept = this.currentDept.id
this.paramsWm.count__gte = 1
this.apiObjWm = this.$API.wpm.wmaterial.list
} else {
this.$message.error("未找到车间");

11
src/views/wpm/mlog_dept6.vue
View File

@ -17,7 +17,7 @@
<el-table-column type="index" width="50" />
<el-table-column label="任务编号" prop="number" width="130">
</el-table-column>
<el-table-column label="产品全名" prop="material_out_name" show-overflow-tooltip width="250">
<el-table-column label="产物" prop="material_out_name" show-overflow-tooltip width="250">
</el-table-column>
<el-table-column label="计划数量" prop="count">
</el-table-column>
@ -86,11 +86,7 @@
<scTable ref="table_handover" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
<el-table-column label="送料日期" prop="send_date">
</el-table-column>
<el-table-column label="产物" prop="material" show-overflow-tooltip>
<template #default="scope"><span v-if="scope.row.material_">{{
scope.row.material_.name
}}</span>
</template>
<el-table-column label="产物" prop="material_name" show-overflow-tooltip>
</el-table-column>
<el-table-column label="批次" prop="batch"> </el-table-column>
<el-table-column label="数量" prop="count">
@ -188,7 +184,8 @@ export default {
recive_dept__name: '6车间'
},
paramsWm: {
belong_dept__name: '6车间'
belong_dept__name: '6车间',
count__gte: 1
},
paramsMtask: {
mgroup__belong_dept__name: '6车间',

13
src/views/wpm/mlog_dept7.vue
View File

@ -84,7 +84,8 @@
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="addMlog"
v-if="currentMtask && currentMtask.state == 20" v-auth="'mlog.create'">新增</el-button>
v-if="currentMtask && currentMtask.state == 20"
v-auth="'mlog.create'">新增</el-button>
</div>
</el-header>
<el-main class="nopadding">
@ -255,13 +256,8 @@
</el-main>
</el-container>
</el-main>
<save-dialog v-if="dialogSave" ref="saveDialog"
:mtask="currentMtask.id"
:mgroup="mgroup"
:material_out="material_out"
:material_in="material_in"
:activeType="activeName"
@success="handleSaveSuccess"
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
:material_out="material_out" :material_in="material_in" :activeType="activeName" @success="handleSaveSuccess"
@closed="dialogSave = false">
</save-dialog>
<showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
@ -370,6 +366,7 @@ export default {
this.apiObjHandover = this.$API.wpm.handover.list
this.paramsWm.belong_dept = this.currentDept.id
this.paramsWm.count__gte = 1
this.apiObjWm = this.$API.wpm.wmaterial.list
} else {
this.$message.error("未找到车间");

23
src/views/wpm/mlog_tui.vue
View File

@ -144,8 +144,8 @@
</el-container>
</el-main>
</el-container>
<el-dialog :title="titleOptions[handoverType]" ref="handoverDialog" v-model="handoverVisible" :size="1000" destroy-on-close
@closed="handoverVisible = false">
<el-dialog :title="titleOptions[handoverType]" ref="handoverDialog" v-model="handoverVisible" :size="1000"
destroy-on-close @closed="handoverVisible = false">
<el-form ref="dialogForm" :model="handoverForm" :rules="rules" label-width="120px">
<el-row>
<el-col :md="12" :sm="24">
@ -156,7 +156,8 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="交送物料" prop="wm">
<el-select v-model="handoverForm.wm" placeholder="交送物料" clearable style="width: 100%" :disabled="handoverType=='edit'">
<el-select v-model="handoverForm.wm" placeholder="交送物料" clearable style="width: 100%"
:disabled="handoverType == 'edit'">
<el-option v-for="item in wmaterialList" :key="item.id" :label="item.material_.name"
:value="item.id"></el-option>
</el-select>
@ -171,7 +172,8 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="交送人" prop="send_user">
<el-select v-model="handoverForm.send_user" placeholder="交送人" clearable style="width: 100%" :disabled="handoverType=='edit'">
<el-select v-model="handoverForm.send_user" placeholder="交送人" clearable style="width: 100%"
:disabled="handoverType == 'edit'">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -187,7 +189,8 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="接收人" prop="recive_user">
<el-select v-model="handoverForm.recive_user" placeholder="接收人" clearable style="width: 100%" :disabled="handoverType=='edit'">
<el-select v-model="handoverForm.recive_user" placeholder="接收人" clearable style="width: 100%"
:disabled="handoverType == 'edit'">
<el-option v-for="item in userList2" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -199,13 +202,8 @@
<el-button type="primary" @click="submitHandover">提交</el-button>
</el-footer>
</el-dialog>
<save-dialog v-if="dialogSave"
ref="saveDialog"
:mgroup="currentMgroup.id"
:mgroupShiftRule = "currentMgroup.shift_rule"
:activeType="activeName"
@success="handleSaveSuccess"
@closed="dialogSave = false">
<save-dialog v-if="dialogSave" ref="saveDialog" :mgroup="currentMgroup.id" :mgroupShiftRule="currentMgroup.shift_rule"
:activeType="activeName" @success="handleSaveSuccess" @closed="dialogSave = false">
</save-dialog>
</template>
<script>
@ -298,6 +296,7 @@ export default {
this.apiObjHandover = this.$API.wpm.handover.list
this.paramsWm.belong_dept = this.currentMgroup.belong_dept
this.paramsWm.count__gte = 1
this.apiObjWm = this.$API.wpm.wmaterial.list
this.$API.system.user.list.req({ page: 0, belong_dept: this.currentMgroup.belong_dept }).then(res => {