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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-27 09:50:38 +08:00
parent dfb47e1166 e286948f47
commit 3d021c44e7
9 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
View File

@@ -12,8 +12,8 @@
<el-row>
<el-col :span="6">
<el-cascader
placeholder="所属库区"
v-model="query.sect"
placeholder="所属库区"
:options="sects"
:props="{ checkStrictly: true }"
clearable
@@ -79,7 +79,7 @@ export default {
url: 'api/structattr',
idField: 'struct_id',
sort: 'struct_id,desc',
query: { search: '', is_lock: '1', lock_type: '',sect_id: '', stor_id: '' },
query: { search: '', is_lock: '1', lock_type: '', sect_id: '', stor_id: '' },
crudMethod: { ...crudStructattr }
})
},

32
lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
View File

@@ -22,22 +22,22 @@
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.package_box_sn"
clearable
size="mini"
placeholder="箱号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
v-model="query.package_box_sn"
clearable
size="mini"
placeholder="箱号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.container_name"
clearable
size="mini"
placeholder="子卷号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
v-model="query.container_name"
clearable
size="mini"
placeholder="子卷号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.material_search"
@@ -143,12 +143,12 @@ export default {
return {
rowspan: 2,
colspan: 1
};
}
} else {
return {
rowspan: 0,
colspan: 0
};
}
}
}
},

30
lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue
View File

@@ -17,38 +17,38 @@
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column prop="bucketunique" label="桶号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="label" label="桶类别"/>
<el-table-column prop="material_code" label="物料编码" width="120px"/>
<el-table-column prop="material_name" label="物料名称" min-width="120"/>
<el-table-column prop="pcsn" label="批次" min-width="100" show-overflow-tooltip/>
<el-table-column prop="bucketunique" label="桶号" min-width="100" show-overflow-tooltip />
<el-table-column prop="label" label="桶类别" />
<el-table-column prop="material_code" label="物料编码" width="120px" />
<el-table-column prop="material_name" label="物料名称" min-width="120" />
<el-table-column prop="pcsn" label="批次" min-width="100" show-overflow-tooltip />
<el-table-column prop="storage_qty" label="数量">
<template slot-scope="scope">
{{ fun(scope.row.storage_qty) }}
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位"/>
<el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型"/>
<el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级"/>
<el-table-column prop="is_active" :formatter="activeFormat" label="是否可用"/>
<el-table-column prop="storagevehicle_code" label="载具号"/>
<el-table-column prop="record_order" label="顺序号"/>
<el-table-column prop="bag_qty" label="袋数"/>
<el-table-column prop="qty_unit_name" label="单位" />
<el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型" />
<el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级" />
<el-table-column prop="is_active" :formatter="activeFormat" label="是否可用" />
<el-table-column prop="storagevehicle_code" label="载具号" />
<el-table-column prop="record_order" label="顺序号" />
<el-table-column prop="bag_qty" label="袋数" />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</el-dialog>
</template>
<script>
import CRUD, {crud} from '@crud/crud'
import CRUD, { crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
export default {
name: 'BucketDtlDiv',
components: {crudOperation, pagination},
components: { crudOperation, pagination },
mixins: [crud()],
props: {
dialogShow: {

2
lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
View File

@@ -166,7 +166,7 @@ import crudRawAssist from '@/views/wms/st/inbill/rawassist'
export default {
name: 'TaskDialog',
components: {StructUpdateDiv },
components: { StructUpdateDiv },
mixins: [crud()],
dicts: ['io_bill_status', 'task_status'],
props: {

22
lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
View File

@@ -8,7 +8,7 @@
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
@@ -105,9 +105,9 @@
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="bill_code" label="出入库单号" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="bill_code" label="出入库单号" align="center" />
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
@@ -135,13 +135,13 @@
>
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="bucket_num" label="桶数" :formatter="crud.formatNum0" align="center" />
<el-table-column prop="bucket_num" label="桶数" :formatter="crud.formatNum0" align="center" />
<el-table-column prop="total_storage_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="start_point_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="start_point_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="taskdtl_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
</el-table>
@@ -153,8 +153,8 @@
import { crud } from '@crud/crud'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudStorattr from "@/views/wms/basedata/st/stor/storattr";
import crudRawAssist from "@/views/wms/st/inbill/rawassist";
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
export default {
name: 'ViewDialog',
@@ -179,7 +179,7 @@ export default {
storlist: [],
currentdtl: null,
currentDis: {},
form:{}
form: {}
}
},
watch: {

6
lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -159,12 +159,12 @@
</el-table-column>
<el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
<template scope="scope">
<el-input-number v-model="scope.row.plan_qty" v-show="!scope.row.edit" :precision="3" :controls="false" :min="1" style="width: 120px" />
<el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
<span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<!-- <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px">
<!-- <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px">
<template slot-scope="scope">
<el-select
v-model="scope.row.quality_scode"
@@ -307,7 +307,7 @@ export default {
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
})
/* crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
/* crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
this.billtypelist = res
})
checkoutbill.getInvTypes().then(res => {

2
lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
View File

@@ -1,8 +1,8 @@
<template>
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
append-to-body
:visible.sync="dialogVisible"
v-loading.fullscreen.lock="fullscreenLoading"
destroy-on-close
:show-close="false"
fullscreen

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

@@ -8,7 +8,7 @@
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
@@ -105,9 +105,9 @@
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" />
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
@@ -135,12 +135,12 @@
>
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="子卷批次号" align="center" />
<el-table-column prop="pcsn" label="子卷批次号" align="center" />
<el-table-column prop="storagevehicle_code" label="箱号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="start_point_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="start_point_code" label="起始位置" align="center" />
<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" />
</el-table>
@@ -152,8 +152,8 @@
import { crud } from '@crud/crud'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudStorattr from "@/views/wms/basedata/st/stor/storattr";
import crudRawAssist from "@/views/wms/st/inbill/rawassist";
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
export default {
name: 'ViewDialog',
@@ -178,7 +178,7 @@ export default {
storlist: [],
currentdtl: null,
currentDis: {},
form:{}
form: {}
}
},
watch: {

2
lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
View File

@@ -155,4 +155,4 @@ export function getType() {
method: 'get'
})
}
export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType,backConfirm, getOutBillDisDtl, getType }
export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType }