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

fix: 修复手持测试过程中遇到的问题

Browse Source
This commit is contained in:
yanps
2024-09-03 17:19:24 +08:00
parent 086267af33
commit 497e47beab
22 changed files with 282 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -10,7 +10,7 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="所属车间" v-if="false">
<el-form-item v-if="false" label="所属车间">
<el-select
v-model="query.workshop_code"
clearable
@@ -20,6 +20,7 @@
>
<el-option
v-for="item in workShopList"
:key="item.workshop_code"
:label="item.workshop_name"
:value="item.workshop_code"
/>
@@ -36,8 +37,8 @@
</el-form-item>
<el-form-item label="区域类型">
<el-select
style="width: 230px;"
v-model="query.region_code"
style="width: 230px;"
clearable
filterable
size="mini"
@@ -48,6 +49,7 @@
>
<el-option
v-for="item in regionList"
:key="item.region_code"
:label="item.region_name"
:value="item.region_code"
/>
@@ -64,6 +66,7 @@
>
<el-option
v-for="item in pointTypesList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -81,6 +84,7 @@
>
<el-option
v-for="item in pointStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -137,7 +141,7 @@
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="540px">
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu" :title="crud.status.title" width="540px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" />
@@ -150,6 +154,7 @@
>
<el-option
v-for="item in workShopList"
:key="item.workshop_code"
:label="item.workshop_name"
:value="item.workshop_code"
/>
@@ -164,6 +169,7 @@
>
<el-option
v-for="item in regionList"
:key="item.region_code"
:label="item.region_name"
:value="item.region_code"
/>
@@ -186,6 +192,7 @@
>
<el-option
v-for="item in pointStatusDialogList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -201,6 +208,7 @@
>
<el-option
v-for="item in pointTypesDialogList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -228,6 +236,22 @@
<el-form-item label="载具数量" prop="vehicle_qty">
<el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
size="mini"
placeholder="点位状态"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in pointStatus"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否有工单">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
@@ -252,15 +276,19 @@
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
<el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
<!-- <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
<el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位类型')">
<template v-slot="scope">
{{ dict.label.point_status[scope.row.point_status] || '未知' }}
</template>
</el-table-column>
<!-- <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
<!-- <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
<!-- <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column> -->
<!-- <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />-->
<!-- <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />-->
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
@@ -387,6 +415,29 @@ export default {
},
data() {
return {
dict: {
label: {
point_status: {
'2': '有货',
'1': '空托盘',
'0': '无货'
}
}
},
pointStatus: [
{
label: '有货',
value: '2'
},
{
label: '空托盘',
value: '1'
},
{
label: '无货',
value: '0'
}
],
permission: {},
rules: {
point_code: [

88
lms/nladmin-ui/src/views/wms/sch/vehicle/index.vue
View File

@@ -46,18 +46,7 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-printer"
size="mini"
@click="printView"
>
打印
</el-button>
</crudOperation>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -111,13 +100,27 @@
@close="materiValueCancel()"
>
<el-form ref="form" :model="updateForm" :rules="rules" size="mini" label-width="110px">
<el-form-item label="载具编号" prop="vehicle_code">
<el-form-item label="载具编码" prop="vehicle_code">
<template>
<el-input v-model="updateForm.vehicle_code" clearable />
</template>
</el-form-item>
<el-form-item label="载具重量(g)" prop="vehicle_weight">
<el-input-number v-model="updateForm.vehicle_weight" clearable style="width: 370px;" />
<el-form-item label="载具类型" prop="vehicle_weight">
<el-select
v-model="updateForm.vehicle_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 390px;"
>
<el-option
v-for="item in dict.storagevehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -125,39 +128,6 @@
<el-button type="primary" @click="pointMateriSubmit()">确认</el-button>
</div>
</el-dialog>
<el-dialog
:before-close="crud.cancelCU"
:close-on-click-modal="false"
title="打印配置"
:visible.sync="printVisible"
width="450px"
>
<el-form ref="form" :model="printForm" size="mini" label-width="150px">
<el-form-item label="纸张高度(mm)" prop="pageh">
<el-input v-model="printForm.pageh" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="纸张宽度(mm)" prop="pagew">
<el-input v-model="printForm.pagew" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="页边距top(mm)" prop="pagetop">
<el-input v-model="printForm.pagetop" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="页边距right(mm)" prop="pageright">
<el-input v-model="printForm.pageright" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="页边距down(mm)" prop="pagedown">
<el-input v-model="printForm.pagedown" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="页边距left(mm)" prop="pageleft">
<el-input v-model="printForm.pageleft" :precision="0" style="width: 150px;" />
</el-form-item>
<br>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="printClose">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="print">打印</el-button>
</div>
</el-dialog>
<el-dialog
:before-close="crud.cancelCU"
:close-on-click-modal="false"
@@ -174,13 +144,12 @@
placeholder="请选择"
class="filter-item"
style="width: 250px;"
@change="getVehicle"
>
<el-option
v-for="item in dict.storagevehicle_type"
:key="item.para1"
:key="item.value"
:label="item.label"
:value="item.para1"
:value="item.value"
/>
</el-select>
</el-form-item>
@@ -258,12 +227,12 @@
</el-table-column>
</el-table>
<!-- 分页组件-->
<MaterDtl
<!-- <MaterDtl
:dialog-show.sync="materialShow"
:is-single="true"
:mater-opt-code="materType"
@setMaterValue="setMaterValue"
/>
/> -->
<pagination />
</div>
</div>
@@ -277,17 +246,17 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
import MaterDtl from './MaterDialog'
const defaultForm = {
vehicle_code: null,
vehicle_name: null,
is_used: '1'
is_used: '1',
vehicle_type: ''
}
export default {
name: 'Storagevehicleinfo',
dicts: ['storagevehicle_type', 'VEHICLE_OVER_TYPE'],
components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl },
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -497,8 +466,9 @@ export default {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
getVehicle(code) {
}
/* getVehicle(code) {
console.log('选中的值:', code) // 调试信息
if (!code) {
this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
this.form.vehicle_code = ''
@@ -507,7 +477,7 @@ export default {
crudStoragevehicleinfo.getVehicle(code).then(res => {
this.form.vehicle_code = res.value
})
}
} */
}
}
</script>