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

rev:更新

Browse Source
This commit is contained in:
gengby
2024-02-18 11:09:46 +08:00
parent bbb76ddc84
commit 8e04672090
50 changed files with 2615 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/App.vue
View File

@@ -24,7 +24,7 @@ export default {
this.timmer = setTimeout(() => {
sessionStorage.clear()
this.logout()
}, 1000 * 60 * 151) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
}, 10000 * 60 * 151) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
},
logout() {
this.$store.dispatch('LogOut').then(() => {

128
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -87,67 +87,67 @@
<el-form-item label="物料型号">
<el-input disabled v-model="form.material_model" style="width: 240px;" />
</el-form-item>
<el-form-item label="A长边">
<el-input-number
v-model.number="form.a_long_side"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="B短边">
<el-input-number
v-model.number="form.b_short_side"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="H高度">
<el-input-number
v-model.number="form.h_height"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="W厚度">
<el-input-number
v-model.number="form.w_thickness"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="静置时间(分钟)">
<el-input-number
v-model.number="form.standing_time"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="冷却时间(小时)">
<el-input-number
v-model.number="form.cooling_time"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="木托盘规格">
<el-tooltip class="item" effect="dark" content="例如：950*1000" placement="top">
<el-select
v-model="form.pack_palletspec"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 240px;"
>
<el-option
v-for="item in dict.vehicle_type"
:label="item.label"
:value="item.label"
:disabled="item.value === 'LZ' || item.value === 'GTP'"
/>
</el-select>
</el-tooltip>
</el-form-item>
<!-- <el-form-item label="A长边">-->
<!-- <el-input-number-->
<!-- v-model.number="form.a_long_side"-->
<!-- :min="0"-->
<!-- style="width: 240px;"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="B短边">-->
<!-- <el-input-number-->
<!-- v-model.number="form.b_short_side"-->
<!-- :min="0"-->
<!-- style="width: 240px;"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="H高度">-->
<!-- <el-input-number-->
<!-- v-model.number="form.h_height"-->
<!-- :min="0"-->
<!-- style="width: 240px;"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="W厚度">-->
<!-- <el-input-number-->
<!-- v-model.number="form.w_thickness"-->
<!-- :min="0"-->
<!-- style="width: 240px;"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="静置时间(分钟)">-->
<!-- <el-input-number-->
<!-- v-model.number="form.standing_time"-->
<!-- :min="0"-->
<!-- style="width: 240px;"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="冷却时间(小时)">-->
<!-- <el-input-number-->
<!-- v-model.number="form.cooling_time"-->
<!-- :min="0"-->
<!-- style="width: 240px;"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="木托盘规格">-->
<!-- <el-tooltip class="item" effect="dark" content="例如：950*1000" placement="top">-->
<!-- <el-select-->
<!-- v-model="form.pack_palletspec"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="请选择"-->
<!-- class="filter-item"-->
<!-- style="width: 240px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in dict.vehicle_type"-->
<!-- :label="item.label"-->
<!-- :value="item.label"-->
<!-- :disabled="item.value === 'LZ' || item.value === 'GTP'"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-tooltip>-->
<!-- </el-form-item>-->
<el-form-item label="包装方式">
<el-tooltip class="item" effect="dark" content="例如：3*6*6" placement="top">
<el-input v-model="form.pack_method" style="width: 240px;" />
@@ -167,12 +167,12 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<!-- <el-table-column prop="raw_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 prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'物料分类标识')" />
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="cooling_time" label="冷却时间(小时)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" />
<!-- <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />-->
<!-- <el-table-column prop="cooling_time" label="冷却时间(小时)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" />-->
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">

199
lms/nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -10,25 +10,26 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="所属车间">
<el-select
v-model="query.workshop_code"
clearable
size="mini"
placeholder="所属车间"
class="filter-item"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="query.workshop_code"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="所属车间"-->
<!-- class="filter-item"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="所属区域" prop="region_code">
<el-select
v-model="query.region_code"
placeholder="请选择"
clearable
@change="hand"
>
<el-option
@@ -47,15 +48,15 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="泥料编码">
<el-input
v-model="query.raw_material_code"
clearable
size="mini"
placeholder="泥料编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!-- <el-form-item label="泥料编码">-->
<!-- <el-input-->
<!-- v-model="query.raw_material_code"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="泥料编码"-->
<!-- @keyup.enter.native="crud.toQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料编码">
<el-input
v-model="query.material_code"
@@ -129,23 +130,23 @@
<el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 240px;" disabled/>
</el-form-item>
<el-form-item label="是否满托">
<el-radio-group v-model="form.is_full" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="批次">
<!-- <el-form-item label="是否满托">-->
<!-- <el-radio-group v-model="form.is_full" style="width: 240px">-->
<!-- <el-radio :label="true">是</el-radio>-->
<!-- <el-radio :label="false">否</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="配盘批次">
<el-input v-model="form.pcsn" style="width: 240px;" />
</el-form-item>
<el-form-item label="静置时间(分钟)">
<el-input-number
v-model.number="form.standing_time"
:min="1"
:max="999"
style="width: 240px;"
/>
</el-form-item>
<!-- <el-form-item label="静置时间(分钟)">-->
<!-- <el-input-number-->
<!-- v-model.number="form.standing_time"-->
<!-- :min="1"-->
<!-- :max="999"-->
<!-- style="width: 240px;"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料数量">
<el-input-number
v-model.number="form.material_qty"
@@ -153,16 +154,16 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="物料重量">
<el-input-number
v-model.number="form.material_weight"
:min="0"
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="工单编码">
<el-input v-model="form.workorder_code" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="物料重量">-->
<!-- <el-input-number-->
<!-- v-model.number="form.material_weight"-->
<!-- :min="0"-->
<!-- style="width: 240px;"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="工单编码">-->
<!-- <el-input v-model="form.workorder_code" style="width: 240px;" />-->
<!-- </el-form-item>-->
<el-form-item label="物料来源">
<el-radio-group v-model="choose" size="mini" style="width: 240px;">
<el-radio-button label="物料" />
@@ -181,12 +182,12 @@
<el-form-item label="物料规格">
<el-input v-model="form.material_spec" disabled style="width: 240px;" />
</el-form-item>
<el-form-item label=" 泥料编码">
<el-input v-model="form.raw_material_code" disabled style="width: 240px;" />
</el-form-item>
<el-form-item label="组盘次数">
<el-input v-model="form.group_number" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label=" 泥料编码">-->
<!-- <el-input v-model="form.raw_material_code" disabled style="width: 240px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="组盘次数">-->
<!-- <el-input v-model="form.group_number" style="width: 240px;" />-->
<!-- </el-form-item>-->
<el-form-item label="任务编码">
<el-input v-model="form.task_code" style="width: 240px;" />
</el-form-item>
@@ -197,7 +198,7 @@
<el-select
v-model="form.group_status"
size="mini"
placeholder="点位状态"
placeholder="组盘状态"
class="filter-item"
style="width: 240px;"
clearable
@@ -209,24 +210,24 @@
/>
</el-select>
</el-form-item>
<el-form-item label="入窑时间">
<el-date-picker
v-model="form.into_kiln_time"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
style="width: 240px;"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出窑时间">
<el-date-picker
v-model="form.out_kiln_time"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
style="width: 240px;"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="入窑时间">-->
<!-- <el-date-picker-->
<!-- v-model="form.into_kiln_time"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- style="width: 240px;"-->
<!-- placeholder="选择日期时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="出窑时间">-->
<!-- <el-date-picker-->
<!-- v-model="form.out_kiln_time"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- style="width: 240px;"-->
<!-- placeholder="选择日期时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--<el-form-item label="是否首个流程任务">
<el-input v-model="form.is_first_flow_task" style="width: 240px;" />
</el-form-item>-->
@@ -246,6 +247,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="配盘状态">
<el-select
v-model="form.link_status"
size="mini"
placeholder="配盘状态"
class="filter-item"
style="width: 240px;"
clearable
>
<el-option
v-for="item in dict.link_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="载具类型">
<el-select
v-model="form.vehicle_type"
@@ -295,27 +312,27 @@
<el-table-column prop="point_code" label="当前点位编码" :min-width="flexWidth('point_code',crud.data,'当前点位编码')" />
<el-table-column prop="point_name" label="当前点位名称" :min-width="flexWidth('point_name',crud.data,'当前点位名称')" />
<el-table-column prop="move_way" label="移动路径" :min-width="flexWidth('move_way',crud.data,'点位名称')" />
<el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
<template slot-scope="scope">
{{scope.row.is_full?'是':'否'}}
</template>
</el-table-column>
<!-- <el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">-->
<!-- <template slot-scope="scope">-->
<!-- {{scope.row.is_full?'是':'否'}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
<!-- <el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />-->
<el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
<el-table-column prop="group_bind_material_status" label="绑定状态" :min-width="flexWidth('group_bind_material_status',crud.data,'入库时间')">
<template slot-scope="scope">
{{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
</template>
</el-table-column>
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<!-- <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />-->
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_name',crud.data,'物料数量')" />
<el-table-column prop="raw_material_code" label="泥料编码" show-overflow-tooltip :min-width="flexWidth('raw_material_code',crud.data,'物料数量')" />
<!-- <el-table-column prop="raw_material_code" label="泥料编码" show-overflow-tooltip :min-width="flexWidth('raw_material_code',crud.data,'物料数量')" />-->
<el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_code',crud.data,'物料数量')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料数量')" />
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
<el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />
<!-- <el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />-->
<!-- <el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />-->
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>-->
<el-table-column prop="group_status" label="组盘状态" :min-width="flexWidth('group_status',crud.data,'组盘状态')">
@@ -323,11 +340,16 @@
{{ dict.label.group_status[scope.row.group_status] }}
</template>
</el-table-column>
<el-table-column prop="link_status" label="配盘状态" :min-width="flexWidth('link_status',crud.data,'配盘状态')">
<template slot-scope="scope">
{{ dict.label.link_status[scope.row.link_status] }}
</template>
</el-table-column>
<!-- <el-table-column prop="is_first_flow_task" label="是否首个流程任务" :min-width="flexWidth('is_first_flow_task',crud.data,'是否首个流程任务')"/>-->
<!-- <el-table-column prop="flow_code" label="流程编码" :min-width="flexWidth('flow_code',crud.data,'流程编码')"/>-->
<!-- <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>-->
<el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" />
<el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" />
<!-- <el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" />-->
<!-- <el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" />-->
<!-- <el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />-->
<!-- <el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />-->
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
@@ -399,11 +421,12 @@ const defaultForm = {
remark: null,
out_kiln_time: null,
into_kiln_time: null,
is_delete: false
is_delete: false,
link_status: '0'
}
export default {
name: 'VehicleMaterialGroup',
dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
dicts: ['group_status', 'group_bind_material_status', 'vehicle_type', 'link_status'],
components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

31
lms/nladmin-ui/src/views/wms/sch/point/PointDialog.vue
View File

@@ -107,6 +107,10 @@ export default {
isSingle: {
type: Boolean,
default: false
},
businessType: {
type: String,
default: ''
}
},
data() {
@@ -128,7 +132,6 @@ export default {
this.tableRadio = item
},
open() {
},
handleSelectionChange(val, row) {
if (val.length > 1 && this.isSingle) {
@@ -148,8 +151,13 @@ export default {
submit() {
// 处理单选
if (this.isSingle && this.tableRadio) {
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.tableRadio)
if (this.businessType === 'businessType'){
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.tableRadio)
} else if (this.businessType === 'businessType2'){
this.$emit('update:dialogShow', false)
this.$emit('tableChanged2', this.tableRadio)
}
return
}
this.rows = this.$refs.table.selection
@@ -158,15 +166,22 @@ export default {
return
}
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
if (this.businessType === 'businessType'){
console.log('businessType进来了')
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
} else if (this.businessType === 'businessType2'){
console.log('businessType2进来了')
this.$emit('update:dialogShow', false)
this.$emit('tableChanged2', this.rows)
}
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 0px;
}
::v-deep .el-dialog__body {
padding-top: 0px;
}
</style>

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

@@ -10,21 +10,21 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="所属车间">
<el-select
v-model="query.workshop_code"
clearable
size="mini"
placeholder="所属车间"
class="filter-item"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="query.workshop_code"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="所属车间"-->
<!-- class="filter-item"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="模糊搜索">
<el-input
v-model="query.blurry"
@@ -165,19 +165,19 @@
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="所属车间">
<el-select
v-model="form.workshop_code"
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="form.workshop_code"-->
<!-- placeholder="请选择"-->
<!-- style="width: 370px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="所属区域" prop="region_code">
<el-select
v-model="form.region_code"
@@ -232,6 +232,9 @@
<el-form-item label="父类编码" prop="vehicle_code">
<el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint"/>
</el-form-item>
<el-form-item label="下一点位" prop="next_point_code">
<el-input v-model="form.next_point_code" clearable style="width: 370px;" @focus="getNextPoint"/>
</el-form-item>
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
@@ -276,15 +279,15 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<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,'点位状态')" />-->
<!-- <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] }}
@@ -300,9 +303,10 @@
<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 prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'载具数量')" />
<el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'载具数量')" />
<!-- <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'载具数量')" />-->
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'载具数量')" />
<el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')"/>
<el-table-column prop="next_point_code" label="下一点位编码" :min-width="flexWidth('next_point_code',crud.data,'下一点位编码')"/>
<el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
<el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<template slot-scope="scope">
@@ -347,7 +351,8 @@
<pagination />
</div>
<ViewDialog ref="viewDialog"/>
<PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged"/>
<PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged" :businessType="'businessType'"/>
<PointDialog :dialog-show.sync="pointDialog2" :is-single="false" @tableChanged2="tableChanged2" :businessType="'businessType2'"/>
</div>
</template>
@@ -385,6 +390,7 @@ const defaultForm = {
in_empty_seq: null,
out_empty_seq: null,
parent_point_code: null,
next_point_code: null,
ext_point_code: null,
ing_task_code: null,
is_has_workder: 'true',
@@ -442,7 +448,8 @@ export default {
pointStatusList: [],
pointStatusDialogList: [],
pointTypesDialogList: [],
pointDialog: false
pointDialog: false,
pointDialog2: false
}
},
created() {
@@ -524,11 +531,19 @@ export default {
}
},
tableChanged(row) {
console.log("tableChanged" + row)
this.form.parent_point_code = row.map(point => point.point_code).join(',')
},
tableChanged2(row) {
console.log("tableChanged2" + row)
this.form.next_point_code = row.map(point => point.point_code).join(',')
},
getParentPoint() {
this.pointDialog = true
},
getNextPoint() {
this.pointDialog2 = true
},
handleClear() {
this.crud.query.region_code = null
this.crud.query.point_type = null

60
lms/nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -10,22 +10,22 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="所属车间">
<el-select
v-model="query.workshop_code"
clearable
size="mini"
placeholder="所属车间"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="query.workshop_code"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="所属车间"-->
<!-- class="filter-item"-->
<!-- @change="hand"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="模糊搜索">
<el-input
v-model="query.blurry"
@@ -48,19 +48,19 @@
:title="crud.status.title"
width="520px">
<el-form style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="所属车间">
<el-select
v-model="form.workshop_code"
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="form.workshop_code"-->
<!-- placeholder="请选择"-->
<!-- style="width: 370px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="区域编码">
<el-input v-model="form.region_code" style="width: 370px;" :disabled="crud.status.edit===1"/>
</el-form-item>
@@ -112,7 +112,7 @@
{{scope.row.is_has_workder?'是':'否'}}
</template>
</el-table-column>
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
<el-table-column prop="order_seq" label="顺序号" :min-width="flexWidth('order_seq',crud.data,'顺序号')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />

64
lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
View File

@@ -10,21 +10,21 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="所属车间">
<el-select
v-model="query.workshop_code"
clearable
size="mini"
placeholder="所属车间"
class="filter-item"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="query.workshop_code"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="所属车间"-->
<!-- class="filter-item"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="模糊搜索">
<el-input
v-model="query.blurry"
@@ -42,19 +42,19 @@
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="820px">
<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="135px" label-suffix=":">
<el-form-item label="所属车间">
<el-select
v-model="form.workshop_code"
placeholder="请选择"
style="width: 240px;"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="form.workshop_code"-->
<!-- placeholder="请选择"-->
<!-- style="width: 240px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="配置编码" prop="config_code">
<el-input v-model="form.config_code" style="width: 240px;" />
</el-form-item>
@@ -250,9 +250,9 @@
<el-form-item v-if="false" label="sql配置">
<el-input v-model="form.sql_param" style="width: 240px;" />
</el-form-item>
<el-form-item v-if="false" label="车间编码">
<el-input v-model="form.workshop_code" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item v-if="false" label="车间编码">-->
<!-- <el-input v-model="form.workshop_code" style="width: 240px;" />-->
<!-- </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: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
@@ -359,7 +359,7 @@
</el-table-column>
<el-table-column prop="unfinish_notify_time" label="未完成通知时间" :min-width="flexWidth('unfinish_notify_time',crud.data,'未完成通知时间')" />
<el-table-column v-if="false" prop="sql_param" label="sql配置" :min-width="flexWidth('sql_param',crud.data,'sql配置')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<!-- <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>-->
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />