root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:新增半成品盘点功能

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-01 15:07:51 +08:00
parent a160d1cd5d
commit 61fc8c2544
18 changed files with 1017 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/AddDialog.vue
View File

@@ -11,22 +11,42 @@
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
<span/>
</el-col>
<el-col :span="4">
<span>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary"
@click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
:model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码"/>
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称"/>
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
<el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
</el-form-item>
<el-form-item label="车间" prop="workshop_id">
<label slot="label">车间</label>
<el-select
v-model="form.workshop_id"
clearable
size="mini"
:disabled="crud.status.view > 0"
placeholder="全部"
class="filter-item"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
@@ -57,7 +77,7 @@
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
v-for="item in dict.ST_INV_CK_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -72,7 +92,7 @@
:disabled="true"
>
<el-option
v-for="item in dict.check_bill_status"
v-for="item in dict.CHECK_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -81,11 +101,12 @@
</el-form-item>
<el-form-item label="明细数" prop="dtl_num">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px" />
<el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model.trim="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
<el-input v-model.trim="form.remark" style="width: 380px;" rows="2" type="textarea"
:disabled="crud.status.view > 0"/>
</el-form-item>
</el-form>
<div class="crud-opts2">
@@ -93,7 +114,7 @@
<span v-if="crud.status.cu > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<el-button
slot="left"
class="filter-item"
@@ -114,31 +135,31 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" />
<el-table-column prop="sect_name" label="盘点库区" align="center" />
<el-table-column prop="struct_name" label="盘点货位" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip />
<el-table-column prop="base_qty" label="桶数" align="center" :formatter="crud.formatNum0" />
<el-table-column prop="fac_qty" label="盘点桶数" align="center" :formatter="crud.formatNum0" />
<el-table-column prop="qty_unit_name" label="计量单位" align="center" />
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="sect_name" label="盘点库区" align="center"/>
<el-table-column prop="struct_name" label="盘点货位" align="center"/>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center"/>
<el-table-column prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip/>
<el-table-column prop="base_qty" label="数量" align="center" :formatter="crud.formatNum0"/>
<el-table-column prop="unit_weight" label="单重" align="center"/>
<el-table-column v-if="crud.status.view > 0" prop="fac_qty" label="盘点重量" align="center" :formatter="crud.formatNum0"/>
<el-table-column prop="storagevehicle_code" label="载具号" align="center"/>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"/>
</template>
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
<AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged"/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/storage_manage/semiproduct/semiproductCheck/AddDtl'
import CRUD, {crud, form} from '@crud/crud'
import AddDtl from '@/views/wms/storage_manage/semiproduct/semiproductCheck/StructIvt'
import check from '@/views/wms/storage_manage/semiproduct/semiproductCheck/check'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
const defaultForm = {
check_code: '',
@@ -148,13 +169,14 @@ const defaultForm = {
status: '10',
dtl_num: '0',
check_type: '',
workshop_id: '',
remark: '',
create_mode: '',
tableData: []
}
export default {
name: 'AddDialog',
components: { AddDtl },
components: {AddDtl},
mixins: [crud(), form(defaultForm)],
props: {
dialogShow: {
@@ -162,7 +184,7 @@ export default {
default: false
}
},
dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status'],
dicts: ['CHECK_BILL_STATUS', 'ST_INV_CK_TYPE', 'check_dtl_status', 'product_area'],
data() {
return {
dialogVisible: false,
@@ -173,10 +195,13 @@ export default {
storlist: [],
rules: {
stor_id: [
{ required: true, message: '仓库不能为空', trigger: 'blur' }
{required: true, message: '仓库不能为空', trigger: 'blur'}
],
check_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
{required: true, message: '业务类型不能为空', trigger: 'blur'}
],
workshop_id: [
{required: true, message: '车间不能为空', trigger: 'blur'}
]
}
}
@@ -191,7 +216,7 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({'stor_type': '2'}).then(res => {
this.storlist = res.content
})
},
@@ -199,7 +224,7 @@ export default {
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
check.getCheckDtl({'check_id': this.form.check_id}).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -210,7 +235,7 @@ export default {
})
},
[CRUD.HOOK.afterToView]() {
check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
check.getCheckDtl({'check_id': this.form.check_id}).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -220,9 +245,6 @@ export default {
}
})
},
bill_statusFormat(row) {
return this.dict.label.check_dtl_status[row.status]
},
storChange(row) {
this.storlist.forEach((item) => {
if (item.stor_id === row) {
@@ -249,17 +271,16 @@ export default {
}
}
if (!this.flagnow) {
item.edit = false
item.status = '01'
tablemap.set(item.struct_code + '间隔' + item.material_code, item)
}
} else {
item.edit = false
item.status = '01'
tablemap.set(item.struct_code + '间隔' + item.material_code, item)
}
})
for (const value of tablemap.values()) {
value.base_qty = value.canuse_qty
this.form.tableData.push(value)
}
this.form.dtl_num = this.form.tableData.length
@@ -287,6 +308,7 @@ export default {
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
padding: 4px 4px;

31
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog.vue
View File

@@ -23,7 +23,7 @@
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
v-for="item in dict.ST_INV_CK_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -53,7 +53,7 @@
:disabled="true"
>
<el-option
v-for="item in dict.check_bill_status"
v-for="item in dict.CHECK_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -101,8 +101,7 @@
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="sect_name" label="盘点库区" align="center" />
<el-table-column prop="struct_name" label="盘点货位" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="100" align="center">
<template scope="scope">
<el-input v-show="isShow(scope.$index, scope.row,1)" v-model="scope.row.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
@@ -111,10 +110,10 @@
</template>
</el-table-column>
<el-table-column prop="material_name" label="物料名称" align="center" />
<el-table-column prop="base_qty" label="桶数" :formatter="crud.formatNum0" align="center" />
<el-table-column show-overflow-tooltip prop="fac_qty" label="盘点桶数" width="160" align="center">
<el-table-column prop="base_qty" label="重量" :formatter="crud.formatNum0" align="center" />
<el-table-column show-overflow-tooltip prop="fac_qty" label="盘点重量" width="160" align="center">
<template scope="scope">
<el-input-number v-show="isShow(scope.$index, scope.row,2)" v-model="scope.row.fac_qty" :precision="0" :min="0" />
<el-input-number v-show="isShow(scope.$index, scope.row,2)" v-model="scope.row.fac_qty" :precision="3" :min="0" />
<span v-show="isShow(scope.$index, scope.row,4)">{{ scope.row.fac_qty }}</span>
</template>
</el-table-column>
@@ -135,14 +134,14 @@
<el-button type="primary" @click="saveCheck">保存</el-button>
<el-button type="primary" @click="submitCheck">确认</el-button>
</span>
<MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
<MaterDialog :dialog-show.sync="materShow" @setMaterValue="tableChanged2" />
</el-dialog>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import check from '@/views/wms/storage_manage/semiproduct/semiproductCheck/check'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
import MaterDialog from '@/views/wms/pub/MaterDialog'
export default {
@@ -161,7 +160,7 @@ export default {
type: Object
}
},
dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status', 'check_result'],
dicts: ['CHECK_BILL_STATUS', 'ST_INV_CK_TYPE', 'CHECK_DTL_STATUS', 'check_result'],
data() {
return {
dialogVisible: false,
@@ -197,15 +196,15 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
check.getOutBillDtl2({ 'check_id': this.form.check_id }).then(res => {
check.getCheckDtl({ 'check_id': this.form.check_id }).then(res => {
this.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.tableData.length; i++) {
const row = this.tableData[i]
row.edit = false
this.$set(row,'edit',false)
if (row.status > '04') {
row.edit = true
}
@@ -303,7 +302,7 @@ export default {
this.form = row
},
bill_statusFormat(row, column) {
return this.dict.label.check_dtl_status[row.status]
return this.dict.label.CHECK_DTL_STATUS[row.status]
},
check_resultFormat(row, column) {
return this.dict.label.check_result[row.check_result]
@@ -313,7 +312,7 @@ export default {
this.crud.notify('请先选中一条已存在的库存明细！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
this.tableData.push({ check_id: this.form.check_id, check_code: this.form.check_code, checkdtl_id: '', sect_id: this.nowrow.sect_id, sect_name: this.nowrow.sect_name, struct_id: this.nowrow.struct_id, struct_name: this.nowrow.struct_name, storagevehicle_id: this.nowrow.storagevehicle_id, storagevehicle_code: this.nowrow.storagevehicle_code, status: '01', material_id: '', material_name: '', base_qty: '0', qty_unit_id: '42', qty_unit_name: '桶', is_down: '0', fac_qty: '', check_result: '0', edit: false })
this.tableData.push({ check_id: this.form.check_id, check_code: this.form.check_code, checkdtl_id: '', sect_id: this.nowrow.sect_id, sect_name: this.nowrow.sect_name, struct_id: this.nowrow.struct_id, struct_name: this.nowrow.struct_name, storagevehicle_id: this.nowrow.storagevehicle_id, storagevehicle_code: this.nowrow.storagevehicle_code, status: '01', material_id: '', material_name: '', base_qty: '0', qty_unit_id: '1', qty_unit_name: 'KG', is_down: '0', fac_qty: '', check_result: '0', edit: false })
this.form.dtl_num = this.tableData.length
},
async queryMater(index, row) {
@@ -323,7 +322,7 @@ export default {
},
tableChanged2(row) {
for (let i = 0; i < this.tableData.length; i++) {
if ((this.tableData[i].material_id === row.material_id) && (this.tableData[i].storagevehicle_code === this.nowrow.storagevehicle_code) && (this.tableData[i].struct_id === this.nowrow.struct_id)) {
if ((this.tableData[i].material_id === row.material_id) && (this.tableData[i].struct_id === this.nowrow.struct_id)) {
this.crud.notify('不允许货位、载具、物料同时相同！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}

26
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/ProcessDialog.vue
View File

@@ -23,7 +23,7 @@
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
v-for="item in dict.ST_INV_CK_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -53,7 +53,7 @@
:disabled="true"
>
<el-option
v-for="item in dict.check_bill_status"
v-for="item in dict.CHECK_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -82,7 +82,7 @@
:disabled="process1_flag"
@click="process1"
>
重新盘点
实盘为准
</el-button>
</span>
@@ -128,9 +128,9 @@
<script>
import { crud } from '@crud/crud'
import check from '@/views/wms/storage_manage/semiproduct/semiproductCheck/check'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import ReCheckDialog from '@/views/wms/storage_manage/semiproduct/semiproductCheck/ReCheckDialog'
import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
import ReCheckDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/ReCheckDialog'
export default {
name: 'ProcessDialog',
@@ -148,7 +148,7 @@ export default {
type: Object
}
},
dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status', 'check_result'],
dicts: ['CHECK_BILL_STATUS', 'ST_INV_CK_TYPE', 'CHECK_DTL_STATUS', 'check_result'],
data() {
return {
dialogVisible: false,
@@ -185,7 +185,7 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
this.getOutBillDtl()
@@ -214,7 +214,7 @@ export default {
this.form = row
},
bill_statusFormat(row, column) {
return this.dict.label.check_dtl_status[row.status]
return this.dict.label.CHECK_DTL_STATUS[row.status]
},
check_resultFormat(row, column) {
return this.dict.label.check_result[row.check_result]
@@ -225,12 +225,12 @@ export default {
})
},
process1() {
if (this.nowrow !== null) {
this.$refs.child3.setReForm(this.nowrow)
}
check.process1({ 'form': this.form, 'row': this.nowrow }).then(res => {
this.getOutBillDtl()
})
},
getOutBillDtl() {
check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
check.getCheckDtl({ 'check_id': this.form.check_id,'check_result': '-1'}).then(res => {
this.tableData = res
})
}

6
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/ReCheckDialog.vue
View File

@@ -138,19 +138,19 @@
<el-button type="primary" @click="process1">确认</el-button>
</span>
<MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
<BucketDialog :dialog-show.sync="bucketShow" @bucketChange="tableChanged2" />
<!-- <BucketDialog :dialog-show.sync="bucketShow" @bucketChange="tableChanged2" />-->
</el-dialog>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import check from '@/views/wms/storage_manage/semiproduct/semiproductCheck/check'
import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
// import BucketDialog from '@/views/wms/st/inStor/rawproductmoreOrless/NewBucketDialog'
import MaterDialog from '@/views/wms/pub/MaterDialog'
export default {
name: 'ReCheckDialog',
components: { MaterDialog, BucketDialog },
components: { MaterDialog },
mixins: [crud()],
props: {
dialogShow: {

156
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/StructIvt.vue Normal file
View File

@@ -0,0 +1,156 @@
<!--suppress ALL -->
<template>
<el-dialog
title="库存选择"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1200px"
@close="close"
@open="open"
>
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="日期">
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="库区/货位">
<el-input
v-model="query.bill_code"
clearable
size="mini"
placeholder="单据号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料">
<el-input
v-model="query.material_search"
clearable
size="mini"
placeholder="物料"
style="width: 230px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation/>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column show-overflow-tooltip width="150" prop="sect_code" label="库区"/>
<el-table-column show-overflow-tooltip width="150" prop="struct_name" label="货位"/>
<el-table-column show-overflow-tooltip prop="material_code" width="250" label="物料编号"/>
<el-table-column show-overflow-tooltip width="100" prop="material_name" label="物料名称"/>
<el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="数量（个）"/>
<el-table-column show-overflow-tooltip prop="unit_weight" label="单重"/>
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具"/>
</el-table>
<!--分页组件-->
<pagination/>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import CRUD, {crud, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
const start = new Date()
export default {
name: 'AddDtl',
components: {crudOperation, rrOperation, pagination, DateRangePicker},
cruds() {
return CRUD({
title: '半成品可用库存',
url: '/api/bcp/getBcpIvt',
crudMethod: {},
optShow: {
reset: true
}
})
},
mixins: [presenter(), header(), crud()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
dialogVisible: false,
rows: [],
tableData: []
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
objectSpanMethod({row, column, rowIndex, columnIndex}) {
if (columnIndex === 0) {
if (rowIndex % 2 === 0) {
return {
rowspan: 2,
colspan: 1
}
} else {
return {
rowspan: 0,
colspan: 0
}
}
}
},
open() {
this.crud.toQuery()
},
close() {
this.$emit('update:dialogShow', false)
},
submit() {
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection
this.$emit('tableChanged', this.rows)
// this.form = this.$options.data().form
}
}
}
</script>

115
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/check.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/check',
url: 'api/bcp/check',
method: 'post',
data
})
@@ -10,57 +10,62 @@ export function add(data) {
export function del(ids) {
return request({
url: 'api/check/',
method: 'delete',
url: 'api/bcp/check/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/check',
method: 'put',
data
})
}
export function getOutBillDtl(params) {
return request({
url: '/api/check/getOutBillDtl',
method: 'get',
params
})
}
export function getOutBillDtl2(params) {
return request({
url: '/api/check/getOutBillDtl2',
method: 'get',
params
})
}
export function getOutBillDis(params) {
return request({
url: '/api/check/getOutBillDis',
method: 'get',
params
})
}
export function getInvTypes() {
return request({
url: '/api/check/getInvTypes',
method: 'get'
})
}
export function insertDtl(data) {
return request({
url: '/api/check/insertDtl',
url: 'api/bcp/check/update',
method: 'post',
data
})
}
export function getCheckDtl(data) {
return request({
url: '/api/bcp/check/getCheckDtl',
method: 'post',
data
})
}
export function getOutBillDtl2(params) {
return request({
url: '/api/bcp/check/getOutBillDtl2',
method: 'get',
params
})
}
export function getOutBillDis(params) {
return request({
url: '/api/bcp/check/getOutBillDis',
method: 'get',
params
})
}
export function getInvTypes() {
return request({
url: '/api/bcp/check/getInvTypes',
method: 'get'
})
}
export function insertDtl(data) {
return request({
url: '/api/bcp/check/insertDtl',
method: 'post',
data
})
}
export function getStructIvt(params) {
return request({
url: '/api/check/getStructIvt',
url: '/api/bcp/check/getStructIvt',
method: 'get',
params
})
@@ -68,37 +73,55 @@ export function getStructIvt(params) {
export function confirm(data) {
return request({
url: '/api/check/confirm',
url: '/api/bcp/check/confirm',
method: 'post',
data
})
}
export function handdown(data) {
return request({
url: '/api/check/handdown',
url: '/api/bcp/check/handdown',
method: 'post',
data
})
}
export function saveCheck(data) {
return request({
url: '/api/check/saveCheck',
url: '/api/bcp/check/saveCheck',
method: 'post',
data
})
}
export function process0(data) {
return request({
url: '/api/check/process0',
url: '/api/bcp/check/process0',
method: 'post',
data
})
}
export function process1(data) {
return request({
url: '/api/check/process1',
url: '/api/bcp/check/process1',
method: 'post',
data
})
}
export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1 }
export default {
add,
edit,
del,
getCheckDtl,
getStructIvt,
getOutBillDtl2,
confirm,
getInvTypes,
saveCheck,
process0,
getOutBillDis,
process1
}

70
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/index.vue
View File

@@ -78,7 +78,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.check_bill_status"
v-for="item in dict.CHECK_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -97,14 +97,14 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
v-for="item in dict.ST_INV_CK_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -173,32 +173,32 @@
/>
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column prop="check_code" min-width="130" label="订单编码">
<el-table-column :selectable="checkboxT" type="selection" width="55"/>
<el-table-column prop="check_code" min-width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.check_code }}</el-link>
</template>
</el-table-column>
<el-table-column :formatter="stateFormat" min-width="100" prop="status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" min-width="100" />
<el-table-column prop="check_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
<el-table-column prop="is_nok" :formatter="is_nokFormat" min-width="100" label="盘点状态" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
<el-table-column label="明细数" align="center" prop="dtl_num" min-width="100" />
<el-table-column prop="input_time" min-width="135" label="创建日期" />
<el-table-column :formatter="stateFormat" min-width="100" prop="status" label="单据状态"/>
<el-table-column prop="stor_name" label="仓库" min-width="100"/>
<el-table-column prop="check_type" :formatter="bill_typeFormat" min-width="100" label="业务类型"/>
<el-table-column prop="is_nok" :formatter="is_nokFormat" min-width="100" label="盘点状态"/>
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100"/>
<el-table-column label="明细数" align="center" prop="dtl_num" min-width="100"/>
<el-table-column prop="create_time" min-width="135" label="创建日期"/>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<AddDialog @AddChanged="querytable" />
<CheckDialog ref="child" @AddChanged="querytable" />
<ProcessDialog ref="child2" @AddChanged="querytable" />
<AddDialog @AddChanged="querytable"/>
<CheckDialog ref="child" @AddChanged="querytable"/>
<ProcessDialog ref="child2" @AddChanged="querytable"/>
</div>
</template>
<script>
import check from '@/views/wms/storage_manage/semiproduct/semiproductCheck/check'
import CRUD, { crud, header, presenter } from '@crud/crud'
import CRUD, {crud, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -206,31 +206,33 @@ import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductCheck/AddDialog'
import CheckDialog from '@/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog'
import ProcessDialog from '@/views/wms/storage_manage/semiproduct/semiproductCheck/ProcessDialog'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
import {download} from '@/api/data'
import {downloadFile} from '@/utils'
export default {
name: 'Check',
components: { CheckDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, ProcessDialog },
name: 'BcpCheck',
components: {CheckDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, ProcessDialog},
cruds() {
return CRUD({ title: '用户',
return CRUD({
title: '用户',
props: {
// 每页数据条数
size: 20
},
idField: 'check_id', url: 'api/check', crudMethod: { ...check },
idField: 'check_id', url: 'api/bcp/check', crudMethod: {...check},
optShow: {
add: true,
edit: false,
del: false,
reset: true,
download: false
}})
}
})
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['check_bill_status', 'ST_CREATE_MODE', 'ST_INV_TYPE_CK'],
dicts: ['CHECK_BILL_STATUS', 'ST_CREATE_MODE', 'ST_INV_CK_TYPE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -246,14 +248,14 @@ export default {
storlist: []
}
},
mounted: function() {
mounted: function () {
const that = this
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 180 + 'px;'
}
},
created() {
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({'stor_type': '3'}).then(res => {
this.storlist = res.content
})
},
@@ -272,7 +274,7 @@ export default {
this.buttonChange(row)
} else if (val.length === 1) {
this.buttonChange(row)
}else{
} else {
this.handleCurrentChange(null)
}
},
@@ -289,7 +291,7 @@ export default {
} else {
this.check_flag = true
}
if (current.status === '30' && current.is_nok === '1') {
if (current.status === '30' && current.is_nok) {
this.confirm_flag = false
} else {
this.confirm_flag = true
@@ -297,16 +299,16 @@ export default {
}
},
stateFormat(row) {
return this.dict.label.check_bill_status[row.status]
return this.dict.label.CHECK_BILL_STATUS[row.status]
},
bill_typeFormat(row) {
return this.dict.label.ST_INV_TYPE_CK[row.check_type]
return this.dict.label.ST_INV_CK_TYPE[row.check_type]
},
create_modeFormat(row) {
return this.dict.label.ST_CREATE_MODE[row.create_mode]
},
is_nokFormat(row) {
if (row.is_nok === '1') {
if (row.is_nok) {
return '异常'
} else {
return '正常'
@@ -336,7 +338,7 @@ export default {
downdtl() {
if (this.currentRow !== null) {
crud.downloadLoading = true
download('/api/check/download', { check_id: this.currentRow.check_id }).then(result => {
download('/api/check/download', {check_id: this.currentRow.check_id}).then(result => {
downloadFile(result, this.currentRow.check_code + '盘点数据', 'xlsx')
crud.downloadLoading = false
}).catch(() => {