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

代码更新

Browse Source
This commit is contained in:
liuxy
2023-01-06 18:26:47 +08:00
parent 153721b600
commit fd55d71261
16 changed files with 781 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue
View File

@@ -115,14 +115,22 @@
>
<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 show-overflow-tooltip prop="sect_name" label="盘点库区" align="center" />
<el-table-column show-overflow-tooltip prop="struct_name" label="盘点货位" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" width="250" label="箱号">
<template slot-scope="scope">
<el-link v-if="crud.status.view > 0" type="warning" @click="openDtlView(scope.row)">{{ scope.row.storagevehicle_code }}</el-link>
<span v-if="crud.status.cu > 0">{{ scope.row.storagevehicle_code }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150" align="center" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="150" show-overflow-tooltip />
<!-- <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" width="200px" >
<template scope="scope">
<el-input v-model="scope.row.remark" size="mini" />
<span>{{ scope.row.remark }}</span>
</template>
</el-table-column>-->
<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)" />
@@ -130,6 +138,7 @@
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
<DtlViewDialog :dialog-show.sync="dtlViewShow" :open-param="paramDtlView"/>
</el-dialog>
</template>
@@ -137,8 +146,8 @@
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/inStor/check/AddDtl'
import check from '@/views/wms/st/inStor/check/check'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import DtlViewDialog from '@/views/wms/st/inStor/check/DtlViewDialog'
const defaultForm = {
check_code: '',
@@ -154,7 +163,7 @@ const defaultForm = {
}
export default {
name: 'AddDialog',
components: { AddDtl },
components: { AddDtl, DtlViewDialog },
mixins: [crud(), form(defaultForm)],
props: {
dialogShow: {
@@ -165,6 +174,8 @@ export default {
dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status'],
data() {
return {
paramDtlView: '',
dtlViewShow: false,
dialogVisible: false,
dtlShow: false,
flagnow: false,
@@ -281,6 +292,10 @@ export default {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
},
openDtlView(row) {
this.paramDtlView = row.storagevehicle_code
this.dtlViewShow = true
}
}
}

43
lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue
View File

@@ -9,18 +9,24 @@
@close="close"
@open="open"
>
<el-row>
<el-col :span="6">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="库区">
<el-cascader
placeholder="库区"
:options="sects"
:props="{ checkStrictly: true }"
clearable
style="width: 200px;"
@change="sectQueryChange"
/>
</el-col>
<el-col :span="6">
</el-form-item>
<el-form-item label="货位">
<el-input
v-model="query.struct_code"
clearable
@@ -30,8 +36,19 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-col>
<el-col :span="6">
</el-form-item>
<el-form-item label="箱号">
<el-input
v-model="query.box_no"
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.remark"
clearable
@@ -41,12 +58,9 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-col>
<el-col :span="6">
<rrOperation />
</el-col>
</el-row>
</el-form-item>
<rrOperation />
</el-form>
<div style="padding: 10px" />
<!--表格渲染-->
<el-table
@@ -63,8 +77,6 @@
<el-table-column prop="storagevehicle_code" label="箱号" :min-width="flexWidth('storagevehicle_code',crud.data,'箱号')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column show-overflow-tooltip prop="base_qty" label="数量" :formatter="crud.formatNum0" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="计量单位" />
</el-table>
<!--分页组件-->
<pagination />
@@ -80,7 +92,6 @@
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {

86
lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue
View File

@@ -91,62 +91,75 @@
ref="table"
:data="tableData"
style="width: 100%;"
max-height="300"
max-height="400"
border
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleCurrentChange"
>
<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">
<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)" />
</el-input>
<span v-show="isShow(scope.$index, scope.row,3)">{{ scope.row.material_code }}</span>
<el-table-column prop="sect_name" label="盘点库区" align="center" width="120px" />
<el-table-column prop="struct_name" label="盘点货位" align="center" width="140px" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" width="250" label="箱号">
<template slot-scope="scope">
<el-link type="warning" @click="openDtlView(scope.row)">{{ scope.row.storagevehicle_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="material_name" show-overflow-tooltip 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 show-overflow-tooltip prop="material_code" label="物料编码" width="150" align="center" />
<el-table-column prop="material_name" show-overflow-tooltip label="物料名称" align="center" width="170px" />
<el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" width="110px" />
<el-table-column show-overflow-tooltip prop="check_result" label="是否异常" align="center" width="210px">
<template scope="scope">
<el-input-number v-show="isShow(scope.$index, scope.row,2)" v-model="scope.row.fac_qty" :precision="0" :min="0" />
<span v-show="isShow(scope.$index, scope.row,4)">{{ scope.row.fac_qty }}</span>
<el-select
v-model="scope.row.check_result"
clearable
placeholder="默认正常"
style="width: 150px"
class="filter-item"
>
<el-option
v-for="item in dict.check_result"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="计量单位" align="center" />
<el-table-column prop="check_result" label="是否异常" align="center" :formatter="check_resultFormat" />
<el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" />
<el-table-column align="center" label="操作" width="160" fixed="right">
<el-table-column prop="remark" label="明细备注" align="center" width="290px">
<template scope="scope">
<el-button :disabled="isCanDel(scope.$index, scope.row,1)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, tableData)" />
<el-button v-show="!scope.row.edit" :disabled="isCanDel(scope.$index, scope.row,2)" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button v-show="scope.row.edit" :disabled="isCanDel(scope.$index, scope.row,2)" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">完成</el-button>
<el-input v-model="scope.row.remark" size="mini" style="width: 250px" />
</template>
</el-table-column>
<!-- <el-table-column align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button :disabled="isCanDel(scope.$index, scope.row,1)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, tableData)" />
<el-button v-show="!scope.row.edit" :disabled="isCanDel(scope.$index, scope.row,2)" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button v-show="scope.row.edit" :disabled="isCanDel(scope.$index, scope.row,2)" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">完成</el-button>
</template>
</el-table-column>-->
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="saveCheck">保存</el-button>
<!-- <el-button type="primary" @click="saveCheck">保存</el-button>-->
<el-button type="primary" @click="submitCheck">确认</el-button>
</span>
<MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
<DtlViewDialog :dialog-show.sync="dtlViewShow" :open-param="paramDtlView"/>
</el-dialog>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import check from '@/views/wms/st/inStor/check/check'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import MaterDialog from '@/views/wms/pub/MaterDialog'
import DtlViewDialog from '@/views/wms/st/inStor/check/DtlViewDialog'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
name: 'CheckDialog',
components: { MaterDialog },
components: { MaterDialog, DtlViewDialog },
mixins: [crud()],
props: {
dialogShow: {
@@ -164,7 +177,9 @@ export default {
data() {
return {
dialogVisible: false,
paramDtlView: '',
materShow: false,
dtlViewShow: false,
add_flag: true,
nowrow: null,
nowindex: '',
@@ -195,9 +210,8 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
check.getOutBillDtl2({ 'check_id': this.form.check_id }).then(res => {
this.tableData = res
@@ -349,18 +363,10 @@ export default {
this.form.detail_count = this.tableData.length
},
submitCheck() {
if (this.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
for (let i = 0; i < this.tableData.length; i++) {
if (!this.tableData[i].edit) {
this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
return false
}
}
check.confirm({ 'row': this.form, 'rows': this.tableData }).then(res => {
this.dialogVisible = false
this.crud.toQuery()
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
saveCheck() {
@@ -377,6 +383,10 @@ export default {
check.saveCheck({ 'row': this.form, 'rows': this.tableData }).then(res => {
this.dialogVisible = false
})
},
openDtlView(row) {
this.paramDtlView = row.storagevehicle_code
this.dtlViewShow = true
}
}
}

141
lms/nladmin-ui/src/views/wms/st/inStor/check/DtlViewDialog.vue Normal file
View File

@@ -0,0 +1,141 @@
<template>
<el-dialog
title="明细详情"
append-to-body
:visible.sync="dialogVisible"
width="1400px"
:before-close="handleClose"
destroy-on-close
@close="close"
@open="open"
>
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="子卷号">
<el-input
v-model="query.pcsn"
clearable
size="mini"
placeholder="子卷号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="sap批次">
<el-input
v-model="query.sap_pcsn"
clearable
size="mini"
placeholder="sap批次"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
<div style="padding: 10px" />
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" align="center" width="140px" />
<el-table-column show-overflow-tooltip prop="net_weight" label="净重" align="center" :formatter="crud.formatNum2" />
<el-table-column show-overflow-tooltip prop="status" label="状态" align="center" :formatter="formatStatus" />
<el-table-column show-overflow-tooltip prop="sale_order_name" label="订单号" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="customer_name" label="客户编码" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="customer_description" label="客户名称" align="center" width="210px" />
<el-table-column show-overflow-tooltip prop="width" label="幅宽" align="center" />
<el-table-column show-overflow-tooltip prop="thickness" label="厚度" align="center" />
<el-table-column show-overflow-tooltip prop="length" label="长度" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="width_standard" label="客户要求幅宽" align="center" width="120px" />
<el-table-column show-overflow-tooltip prop="thickness_request" label="物料标准厚度" align="center" width="120px" />
<el-table-column show-overflow-tooltip prop="quality_guaran_period" label="保质期" align="center" />
<el-table-column show-overflow-tooltip prop="date_of_production" label="制造完成日期" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="date_of_fg_inbound" label="入库日期" align="center" width="150px" />
</el-table>
<!--分页组件-->
<pagination />
</el-dialog>
</template>
<script>
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
export default {
name: 'DtlViewDialog',
dicts: ['sub_package_relation'],
components: { rrOperation, pagination },
mixins: [presenter(), header()],
cruds() {
return CRUD({ title: '用户', idField: 'stockrecord_id', url: 'api/check/getDtlView',
optShow: {
add: false,
edit: false,
del: false,
reset: true,
download: false
}})
},
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: String
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
data() {
return {
dialogVisible: false
}
},
methods: {
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done()
})
.catch(_ => {
})
},
open() {
this.crud.query.box_no = this.openParam
this.crud.toQuery()
},
close() {
this.$emit('update:dialogShow', false)
},
formatStatus(row) {
return this.dict.label.sub_package_relation[row.status]
}
}
}
</script>
<style scoped>
</style>

289
lms/nladmin-ui/src/views/wms/st/inStor/check/ProcessDialog.vue
View File

@@ -1,249 +1,148 @@
<template>
<el-dialog
title="盘点单异常处理"
title="异常处理"
append-to-body
fullscreen
:visible.sync="dialogVisible"
@open="open"
width="1400px"
:before-close="handleClose"
destroy-on-close
@close="close"
@open="open"
>
<el-card class="box-card" shadow="never">
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
<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="check_code">
<el-input v-model="form.check_code" placeholder="单据号" clearable disabled />
</el-form-item>
<el-form-item label="业务类型" prop="check_type">
<el-select
v-model="form.check_type"
placeholder="业务类型"
:disabled="true"
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<el-select
v-model="form.stor_id"
placeholder="仓库"
class="filter-item"
:disabled="true"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select
v-model="form.status"
placeholder="单据状态"
class="filter-item"
:disabled="true"
>
<el-option
v-for="item in dict.check_bill_status"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="dtl_num">
<el-input v-model="form.dtl_num" style="width: 200px" :disabled="true" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" :disabled="true" style="width: 480px;" clearable :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" maxlength="100" show-word-limit />
</el-form-item>
</el-form>
</el-card>
<div class="crud-opts2">
<span class="role-span">盘点单明细</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="箱号">
<el-input
v-model="query.box_no"
clearable
size="mini"
:disabled="process1_flag"
@click="process1"
>
重新盘点
</el-button>
</span>
placeholder="子卷号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
:disabled="process0_flag"
@click="process0"
>
账务为准
</el-button>
</div>
<div style="padding: 10px" />
<!--表格渲染-->
<el-table
ref="table"
:data="tableData"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
max-height="300"
border
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleCurrentChange"
>
<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 prop="material_name" label="物料名称" align="center" />
<el-table-column prop="base_qty" label="桶数" align="center" />
<el-table-column show-overflow-tooltip prop="fac_qty" label="盘点桶数" :formatter="crud.formatNum0" width="160" align="center" />
<el-table-column prop="qty_unit_name" label="计量单位" align="center" />
<el-table-column prop="check_result" label="盘点结果" align="center" :formatter="check_resultFormat" />
<el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" />
<el-table-column type="selection" />
<el-table-column show-overflow-tooltip prop="seq_no" label="明细序号" align="center" width="100px" />
<el-table-column show-overflow-tooltip prop="status" label="状态" align="center" width="100px" :formatter="formatStatus" />
<el-table-column show-overflow-tooltip prop="sect_name" label="盘点库区" align="center" width="100px" />
<el-table-column show-overflow-tooltip prop="struct_name" label="货位名称" align="center" width="140px" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="箱号" align="center" width="250px" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" width="180px" />
<el-table-column show-overflow-tooltip prop="is_process" label="是否处理" align="center" :formatter="formatIsProcess" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" width="210px" />
<el-table-column show-overflow-tooltip prop="process_time" label="处理时间" align="center" width="150px" />
</el-table>
<!--分页组件-->
<pagination />
<span slot="footer" class="dialog-footer">
<el-button @click="close">取 消</el-button>
<el-button type="primary" @click="disposeConfirm">处理确认</el-button>
</span>
</el-dialog>
</template>
<script>
import { crud } from '@crud/crud'
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import check from '@/views/wms/st/inStor/check/check'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
export default {
name: 'ProcessDialog',
components: { },
mixins: [crud()],
dicts: ['check_dtl_status', 'IS_OR_NOT'],
components: { rrOperation, pagination },
mixins: [presenter(), header()],
cruds() {
return CRUD({ title: '用户', idField: 'stockrecord_id', url: 'api/check/getExceptionDispose',
optShow: {
add: false,
edit: false,
del: false,
reset: true,
download: false
}})
},
props: {
dialogShow: {
type: Boolean,
default: false
},
bussConfig: {
type: Object
},
openParam: {
type: Object
}
},
dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status', 'check_result'],
data() {
return {
dialogVisible: false,
materShow: false,
process1_flag: true,
process0_flag: true,
nowrow: null,
nowindex: '',
storlist: [],
form: {
check_id: '',
check_code: '',
stor_id: '',
stor_code: '',
stor_name: '',
status: '10',
dtl_num: '0',
check_type: '',
remark: '',
create_mode: ''
},
tableData: [],
rules: {
}
type: String
}
},
watch: {
dialogShow: {
handler(newValue) {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
data() {
return {
dialogVisible: false
}
},
methods: {
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done()
})
.catch(_ => {
})
},
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
this.storlist = res.content
})
this.getOutBillDtl()
this.crud.query.check_code = this.openParam
this.crud.toQuery()
},
close() {
this.$emit('AddChanged')
this.$emit('update:dialogShow', false)
},
handleCurrentChange(current) {
if (current !== null) {
this.nowrow = current
if (current.status === '05' || current.status === '06') {
this.process0_flag = false
this.process1_flag = false
} else {
this.process0_flag = true
this.process1_flag = true
}
} else {
this.nowrow = null
this.process0_flag = true
this.process1_flag = true
}
},
setForm(row) {
this.dialogVisible = true
this.form = row
},
bill_statusFormat(row, column) {
formatStatus(row) {
return this.dict.label.check_dtl_status[row.status]
},
check_resultFormat(row, column) {
return this.dict.label.check_result[row.check_result]
formatIsProcess(row) {
return this.dict.label.IS_OR_NOT[row.is_process]
},
process0() {
check.process0({ 'form': this.form, 'row': this.nowrow }).then(res => {
this.getOutBillDtl()
})
},
process1() {
if (this.nowrow !== null) {
this.$refs.child3.setReForm(this.nowrow)
disposeConfirm() {
const _selectData = this.$refs.table.selection
if (_selectData.length === 0) {
return this.crud.notify('请选择明细！', CRUD.NOTIFICATION_TYPE.INFO)
}
},
getOutBillDtl() {
check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
this.tableData = res
const data = {
'rows': _selectData
}
check.disposeConfirm(data).then(res => {
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}
</script>
<style>
.crud-opts2 {
padding: 0 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
padding: 4px 4px;
}
<style scoped>
</style>

9
lms/nladmin-ui/src/views/wms/st/inStor/check/check.js
View File

@@ -101,4 +101,11 @@ export function process1(data) {
data
})
}
export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1 }
export function disposeConfirm(data) {
return request({
url: '/api/check/disposeConfirm',
method: 'post',
data
})
}
export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1, disposeConfirm }

30
lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue
View File

@@ -119,18 +119,18 @@
>
盘点
</el-button>
<!-- <el-button
<el-button
slot="right"
class="filter-item"
type="warning"
:disabled="confirm_flag"
icon="el-icon-check"
size="mini"
@click="confirm"
@click="exceptionDispose"
>
异常处理
</el-button>
<el-button
<!-- <el-button
slot="right"
class="filter-item"
type="success"
@@ -171,25 +171,25 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="check_code" width="130" label="单据号">
<el-table-column show-overflow-tooltip prop="check_code" width="160" 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 show-overflow-tooltip :formatter="stateFormat" width="100" prop="status" label="单据状态" />
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="150" prop="status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="120" />
<el-table-column show-overflow-tooltip prop="check_type" :formatter="bill_typeFormat" width="120" label="业务类型" />
<el-table-column show-overflow-tooltip prop="is_nok" :formatter="is_nokFormat" width="120" label="盘点状态" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="120" />
<el-table-column label="明细数" align="center" prop="dtl_num" width="120" />
<el-table-column show-overflow-tooltip prop="input_time" width="150" label="创建日期" />
<el-table-column show-overflow-tooltip prop="check_type" :formatter="bill_typeFormat" width="150" label="业务类型" />
<el-table-column show-overflow-tooltip prop="is_nok" :formatter="is_nokFormat" width="150" label="盘点状态" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="150" />
<el-table-column label="明细数" align="center" prop="dtl_num" width="150" />
<el-table-column show-overflow-tooltip prop="input_time" width="170" label="创建日期" />
</el-table>
<!--分页组件-->
<pagination />
</div>
<AddDialog @AddChanged="querytable" />
<CheckDialog ref="child" @AddChanged="querytable" />
<ProcessDialog ref="child2" @AddChanged="querytable" />
<ProcessDialog :dialog-show.sync="processDialogShow" :open-param="openParam" />
</div>
</template>
@@ -203,7 +203,6 @@ import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/st/inStor/check/AddDialog'
import CheckDialog from '@/views/wms/st/inStor/check/CheckDialog'
import ProcessDialog from '@/views/wms/st/inStor/check/ProcessDialog'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
@@ -232,6 +231,8 @@ export default {
edit: ['admin', 'check:edit'],
del: ['admin', 'check:del']
},
processDialogShow: false,
openParam: '',
check_flag: true,
downdtl_flag: true,
confirm_flag: true,
@@ -341,6 +342,11 @@ export default {
this.onSelectAll()
this.crud.toQuery()
this.handleCurrentChange(null)
},
exceptionDispose() {
const _selectData = this.$refs.table.selection
this.openParam = _selectData[0].check_code
this.processDialogShow = true
}
}
}