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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-01-06 14:32:48 +08:00
parent 6c8cffb8b7
commit 2cda82fa09
16 changed files with 341 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-ui/src/views/system/menu/dd/index.vue
View File

@@ -67,10 +67,10 @@
<el-radio-button label="0">否</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单可见" prop="hidden">
<el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单隐藏" prop="hidden">
<el-radio-group v-model="form.hidden" size="mini">
<el-radio-button label="1">是</el-radio-button>
<el-radio-button label="0">否</el-radio-button>
<el-radio-button label=true>是</el-radio-button>
<el-radio-button label=false>否</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.type.toString() !== '2'" label="菜单标题" prop="title">

2
lms/nladmin-ui/src/views/system/menu/index.vue
View File

@@ -79,7 +79,7 @@
<el-radio-button label="0">否</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单可见" prop="hidden">
<el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单隐藏" prop="hidden">
<el-radio-group v-model="form.hidden" size="mini">
<el-radio-button label=true>是</el-radio-button>
<el-radio-button label=false>否</el-radio-button>

133
lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue
View File

@@ -12,21 +12,13 @@
label-suffix=":"
>
<el-form-item label="载具类型">
<el-select
<treeselect
v-model="query.storagevehicle_type"
clearable
size="mini"
:load-options="loadChildNodes"
:options="classes1"
style="width: 220px"
placeholder="请选择"
class="filter-item"
style="width: 180px;"
@change="hand"
>
<el-option
v-for="item in dict.storagevehicle_type"
:label="item.label"
:value="item.value"
/>
</el-select>
/>
</el-form-item>
<el-form-item label="载具号">
@@ -35,7 +27,7 @@
clearable
size="mini"
placeholder="起始载具号"
style="width: 110px;"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
@@ -45,12 +37,12 @@
clearable
size="mini"
placeholder="结束载具号"
style="width: 110px;"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
@@ -77,28 +69,17 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="载具类型" prop="storagevehicle_type">
<el-select
<treeselect
v-model="form.storagevehicle_type"
clearable
size="mini"
:load-options="loadChildNodes"
:options="classes1"
style="width: 220px"
placeholder="请选择"
class="filter-item"
style="width: 250px;"
@change="getVehicle"
>
<el-option
v-for="item in dict.storagevehicle_type"
:label="item.label"
:value="item.value"
/>
</el-select>
/>
</el-form-item>
<br>
<el-form-item label="起始载具号" prop="storagevehicle_code">
<el-input v-model="form.storagevehicle_code" :disabled="true" style="width: 250px;" />
</el-form-item>
<el-form-item label="载具数量" prop="num">
<el-input-number v-model="form.num" :precision="0" style="width: 150px;" />
<el-input-number v-model="form.num" :precision="0" style="width: 150px;"/>
</el-form-item>
<el-form-item label="是否启用">
<el-radio v-model="form.is_used" label="0">否</el-radio>
@@ -120,17 +101,17 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
<el-table-column prop="storagevehicle_type_name" label="载具类型" />
<el-table-column prop="storagevehicle_code" label="载具编码" />
<el-table-column prop="storagevehicle_name" label="载具名称" />
<el-table-column prop="is_task" label="是否搬运中" :formatter="formatIsTask" />
<el-table-column prop="point_code" label="当前点位" width="120px" />
<el-table-column prop="start_point_code" label="起点" width="120px" />
<el-table-column prop="next_point_code" label="终点" width="120px" />
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" />
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识"/>
<el-table-column prop="storagevehicle_type_name" label="载具类型"/>
<el-table-column prop="storagevehicle_code" label="载具编码"/>
<el-table-column prop="storagevehicle_name" label="载具名称"/>
<!-- <el-table-column prop="is_task" label="是否搬运中" :formatter="formatIsTask"/>-->
<!--<el-table-column prop="point_code" label="当前点位" width="120px"/>
<el-table-column prop="start_point_code" label="起点" width="120px"/>
<el-table-column prop="next_point_code" label="终点" width="120px"/>-->
<el-table-column prop="material_code" label="物料编码"/>
<el-table-column prop="material_name" label="物料名称"/>
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -141,8 +122,8 @@
/>
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150px" />
<el-table-column prop="create_name" label="创建人"/>
<el-table-column prop="create_time" label="创建时间" width="150px"/>
<el-table-column
v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
label="操作"
@@ -160,7 +141,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
</div>
</template>
@@ -173,6 +154,9 @@ 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 Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/views/wms/basedata/master/class/classstandard'
const defaultForm = {
storagevehicle_id: null,
@@ -201,7 +185,7 @@ const defaultForm = {
export default {
name: 'Storagevehicleinfo',
dicts: ['storagevehicle_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -232,10 +216,8 @@ export default {
return {
resultCodeArr: [],
permission: {},
classes1: [],
rules: {
storagevehicle_code: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
@@ -264,6 +246,9 @@ export default {
}
}
},
created() {
this.initClass1()
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
@@ -294,6 +279,42 @@ export default {
format_is_used(is_used) {
return is_used === '1'
},
initClass1() {
const param = {
parent_class_code: 'vehicle_type'
}
crudClassstandard.getClassType(param).then(res => {
const data = res.content
this.buildTree(data)
this.classes1 = data
})
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {
this.buildTree(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null // 重点代码
}
})
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 100)
})
}
},
print() {
const _selectData = this.$refs.table.selection
if (!_selectData || _selectData.length < 1) {
@@ -340,16 +361,6 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
getVehicle(code) {
if (!code) {
this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
this.form.storagevehicle_code = ''
return false
}
crudStoragevehicleinfo.getVehicle(code).then(res => {
this.form.storagevehicle_code = res.value
})
},
formatIsTask(row) {
if (row.is_task === '1') {
return '是'

40
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -183,7 +183,7 @@
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px">
<el-row>
<el-col :span="12">
<el-form-item label="木箱唯一码">
<el-form-item label="木箱唯一码" prop="package_box_sn">
<el-input v-model="form.package_box_sn" style="width: 300px;" />
</el-form-item>
</el-col>
@@ -308,7 +308,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="SAP批次">
<el-form-item label="SAP批次" prop="sap_pcsn">
<el-input v-model="form.sap_pcsn" style="width: 300px;" />
</el-form-item>
</el-col>
@@ -327,36 +327,36 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="长">
<el-form-item label="长" prop="box_length">
<el-input-number v-model="form.box_length" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宽">
<el-form-item label="宽" prop="box_width">
<el-input-number v-model="form.box_width" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="高">
<el-form-item label="高" prop="box_high">
<el-input-number v-model="form.box_high" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="销售订单及行号">
<el-form-item label="销售订单及行号" prop="sale_order_name">
<el-input v-model="form.sale_order_name" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料主数据厚度">
<el-form-item label="物料主数据厚度" prop="thickness_request">
<el-input v-model="form.thickness_request" :controls="false" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="要求幅宽">
<el-form-item label="要求幅宽" prop="width_standard">
<el-input v-model="form.width_standard" style="width: 300px;" />
</el-form-item>
</el-col>
@@ -479,6 +479,12 @@ export default {
customer_description: [
{ required: true, message: '客户名称不能为空', trigger: 'blur' }
],
customer_name: [
{ required: true, message: '客户编码不能为空', trigger: 'blur' }
],
package_box_sn: [
{ required: true, message: '木箱唯一码不能为空', trigger: 'blur' }
],
product_name: [
{ required: true, message: '产品编码不能为空', trigger: 'blur' }
],
@@ -509,6 +515,24 @@ export default {
sale_order_name: [
{ required: true, message: '销售订单及行号不能为空', trigger: 'blur' }
],
width_standard: [
{ required: true, message: '要求幅宽不能为空', trigger: 'blur' }
],
thickness_request: [
{ required: true, message: '物流主数据厚度不能为空', trigger: 'blur' }
],
box_length: [
{ required: true, message: '长不能为空', trigger: 'blur' }
],
box_width: [
{ required: true, message: '宽不能为空', trigger: 'blur' }
],
box_high: [
{ required: true, message: '高不能为空', trigger: 'blur' }
],
sap_pcsn: [
{ required: true, message: 'SAP批次不能为空', trigger: 'blur' }
],
is_un_plan_production: [
{ required: true, message: '计划外分切的子卷不能为空', trigger: 'blur' }
],

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

@@ -344,6 +344,10 @@ export default {
this.form.out_stor_id = ''
}
if (this.form.bill_type === '1004') {
if (!this.form.out_stor_id) {
this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (this.form.out_stor_id === this.form.stor_id) {
this.crud.notify('移出仓库和移入仓库不能一致！', CRUD.NOTIFICATION_TYPE.INFO)
return false