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

add：新增需求

Browse Source
This commit is contained in:
liuxy
2024-03-13 09:08:53 +08:00
parent 036bc71e08
commit 83d45da5c3
35 changed files with 1386 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDialog.vue
View File

@@ -152,6 +152,16 @@
>
添加库存物料
</el-button>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-arrow-down"
size="mini"
@click="Import"
>
物料信息导入
</el-button>
</span>
</div>
@@ -217,6 +227,7 @@
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged"/>
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged"/>
<UploadDialog :dialog-show.sync="viewShow" :stor-id="paramViewShow" @tableChanged="tableChanged"/>
</el-dialog>
</template>
@@ -226,6 +237,7 @@ import AddDtl from '@/views/wms/st/inStor/productscrap/AddDtl'
import productscrap from '@/views/wms/st/inStor/productscrap/productscrap'
import StructDiv from '@/views/wms/pub/StructDialog'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import UploadDialog from '@/views/wms/st/inStor/productscrap/UploadDialog'
const defaultForm = {
bill_code: '',
@@ -243,7 +255,7 @@ const defaultForm = {
}
export default {
name: 'AddDialog',
components: { AddDtl, StructDiv },
components: { AddDtl, StructDiv, UploadDialog },
mixins: [crud(), form(defaultForm)],
props: {
dialogShow: {
@@ -255,12 +267,14 @@ export default {
data() {
return {
dialogVisible: false,
viewShow: false,
dtlShow: false,
structShow: false,
structShow2: false,
flagnow: false,
nowrow: {},
nowindex: '',
paramViewShow: '',
storlist: [],
invtypelist: [],
storId: null,
@@ -461,6 +475,13 @@ export default {
this.form.tableData.splice(i, 1, this.form.tableData[i])
}
}
},
Import() {
if (!this.form.stor_id) {
return this.crud.notify('请先选择仓库！', CRUD.NOTIFICATION_TYPE.INFO)
}
this.paramViewShow = this.form.stor_id
this.viewShow = true
}
}
}

120
lms/nladmin-ui/src/views/wms/st/inStor/productscrap/UploadDialog.vue Normal file
View File

@@ -0,0 +1,120 @@
<template>
<el-dialog
title="导入Excel文件"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="400px"
:show-close="true"
@close="close"
@open="open"
>
<el-upload
ref="upload"
class="upload-demo"
action=""
drag
:on-exceed="is_one"
:limit="1"
:auto-upload="false"
:multiple="false"
:show-file-list="true"
:on-change="uploadByJsqd"
:file-list="fileList"
accept=".xlsx,.xls"
>
<i class="el-icon-upload" />
<div class="el-upload__text">
将文件拖到此处，或
<em>点击上传</em>
</div>
<div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
</el-upload>
<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 productscrap from '@/views/wms/st/inStor/productscrap/productscrap'
import CRUD, { crud } from '@crud/crud'
export default {
name: 'UploadDialog',
mixins: [crud()],
components: {},
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: String
},
storId: {
type: String
}
},
data() {
return {
dialogVisible: false,
fileList: [],
file1: ''
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
},
openParam: {
handler(newValue, oldValue) {
this.opendtlParam = newValue
}
}
},
methods: {
open() {
},
close() {
this.$emit('update:dialogShow', false)
},
is_one() {
this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
},
// 文件校验方法
beforeAvatarUpload(file) {
// 不能导入大小超过2Mb的文件
if (file.size > 10 * 1024 * 1024) {
return false
}
return true
},
// 文件发生改变就会触发的事件
uploadByJsqd(file) {
this.file1 = file
},
submit() {
if (this.beforeAvatarUpload(this.file1)) {
this.fileList.name = this.file1.name
this.fileList.url = ''
var formdata = new FormData()
formdata.append('file', this.file1.raw)
formdata.set('stor_id', this.storId)
// excelImport：请求接口 formdata：传递参数
productscrap.excelImport(formdata).then((res) => {
this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.$emit('tableChanged', res)
this.$emit('update:dialogShow', false)
})
} else {
this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
}
}
}
}
</script>

1
lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue
View File

@@ -159,6 +159,7 @@
<el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')"/>
<el-table-column label="明细数" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')"/>
<el-table-column label="总重量" prop="total_qty" :min-width="flexWidth('total_qty',crud.data,'总重量')"/>
<el-table-column prop="ext_code" label="外部标识" :min-width="flexWidth('ext_code',crud.data,'外部标识')"/>
<el-table-column prop="input_optname" label="创建人" :min-width="flexWidth('input_optname',crud.data,'创建人')"/>
<el-table-column prop="input_time" label="创建日期" :min-width="flexWidth('input_time',crud.data,'创建日期')"/>
<el-table-column prop="confirm_optname" label="确认人" :min-width="flexWidth('confirm_optname',crud.data,'确认人')"/>

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

@@ -59,4 +59,11 @@ export function onSubmit(data) {
data
})
}
export default { add, edit, del, getOutBillDtl, auditPass, auditOut, onSubmit }
export function excelImport(data) {
return request({
url: 'api/productscrap/importExcel',
method: 'post',
data
})
}
export default { add, edit, del, getOutBillDtl, auditPass, auditOut, onSubmit, excelImport }

19
lms/nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -103,6 +103,24 @@
/>
</el-select>
</el-form-item>
<el-form-item label="交货单号">
<el-input
v-model="query.vbeln"
size="mini"
clearable
placeholder="交货单号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="木箱号">
<el-input
v-model="query.box_no"
size="mini"
clearable
placeholder="木箱号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="子卷号">
<el-input
v-model="query.pcsn"
@@ -217,6 +235,7 @@
{{ fun(scope.row.total_qty) }}
</template>
</el-table-column>
<el-table-column label="交货单" align="center" prop="vbeln" width="150px" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="制单人" align="center" prop="input_optname" />
<el-table-column label="制单时间" align="center" prop="input_time" width="150" />

7
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -256,6 +256,8 @@
<el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" width="150px" label="仓位编码" align="center" />
<el-table-column show-overflow-tooltip prop="struct_name" width="150px" label="仓位名称" align="center" />
<el-table-column show-overflow-tooltip prop="is_overdue" width="150px" label="是否超期" align="center" :formatter="formatOverdue"/>
<el-table-column show-overflow-tooltip prop="instorage_time" width="150px" label="入库时间" align="center" />
<el-table-column show-overflow-tooltip prop="task_code" width="150px" label="任务号" align="center" />
<el-table-column show-overflow-tooltip prop="point_code" width="150px" label="出库点" align="center" />
<el-table-column align="center" label="操作" width="160" fixed="right">
@@ -282,7 +284,7 @@ export default {
name: 'DivDialog',
components: { PointDialog, StructIvt },
mixins: [crud()],
dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'work_status', 'is_usable'],
dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'work_status', 'is_usable', 'IS_OR_NOT'],
props: {
dialogShow: {
type: Boolean,
@@ -387,6 +389,9 @@ export default {
ivt_levelFormat(row, column) {
return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
},
formatOverdue(row, column) {
return this.dict.label.IS_OR_NOT[row.is_overdue]
},
is_activeFormat(row, column) {
return this.dict.label.is_usable[row.is_active]
},

9
lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
View File

@@ -166,7 +166,9 @@
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="struct_code" label="仓位" align="center" show-overflow-tooltip />
<el-table-column prop="sect_name" label="区域" align="center" show-overflow-tooltip />
<!-- <el-table-column prop="next_point_code" label="目的位置" align="center" />-->
<el-table-column show-overflow-tooltip prop="instorage_time" width="150px" label="入库时间" align="center" />
<el-table-column show-overflow-tooltip prop="is_overdue" width="150px" label="是否超期" align="center" :formatter="formatOverdue"/>
<!-- <el-table-column prop="next_point_code" label="目的位置" align="center" />-->
<!-- <el-table-column prop="task_code" label="任务号" align="center" />-->
<!-- <el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />-->
<el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
@@ -187,7 +189,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL','ST_INV_OUT_TYPE', 'INANDOUT_BILL_TYPE'],
dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL','ST_INV_OUT_TYPE', 'INANDOUT_BILL_TYPE', 'IS_OR_NOT'],
props: {
dialogShow: {
type: Boolean,
@@ -246,6 +248,9 @@ export default {
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
formatOverdue(row, column) {
return this.dict.label.IS_OR_NOT[row.is_overdue]
},
task_statusFormat(row) {
return this.dict.label.task_status[row.task_status]
},

9
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -104,6 +104,15 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="木箱号">
<el-input
v-model="query.box_no"
size="mini"
clearable
placeholder="木箱号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="子卷批次">
<el-input
v-model="query.pcsn"