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

Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge

Browse Source 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java
This commit is contained in:
liuxy
2024-07-01 13:58:54 +08:00
parent ea5bfbf40e a6536eb7ad
commit 4c07bdbfca
21 changed files with 705 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@
<el-input-number v-model="form.num" v-if="crud.status.add > 0" :precision="0" style="width: 150px;"/>
</el-form-item>
<el-form-item label="载具重量" v-if="crud.status.edit > 0" prop="qty">
<el-input-number v-model="form.qty" :precision="0" style="width: 150px;"/>
<el-input-number v-model="form.qty" :precision="1" style="width: 150px;"/>
</el-form-item>
<el-form-item label="绑定物料" v-if="crud.status.edit > 0" prop="pcsn">
<el-input v-model="form.pcsn" :precision="0" style="width: 150px;"/>

2
lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue
View File

@@ -115,7 +115,7 @@ export default {
level: 3,
currentId: 0, menuLoading: false, showButton: false,
menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
tableData: [{ 'product_area': 'A1' }, { 'product_area': 'A2' }, { 'product_area': 'A3' }, { 'product_area': 'A4' }, { 'product_area': 'LK' }, { 'product_area': 'B1' }, { 'product_area': 'B2' }, { 'product_area': 'B3' }, { 'product_area': 'B4' }],
tableData: [{ 'product_area': 'A1' }, { 'product_area': 'A2' }, { 'product_area': 'A3' }, { 'product_area': 'A4' }, { 'product_area': 'LK' }, { 'product_area': 'B1' }, { 'product_area': 'B2' }, { 'product_area': 'B3' }, { 'product_area': 'B4' }, { 'product_area': 'BLK' }],
currentRow: null,
permission: {
add: ['admin', 'roles:add'],

8
lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js
View File

@@ -32,17 +32,17 @@ export function changeActive(data) {
})
}
export function oneCreate(data) {
export function blurQuery(data) {
return request({
url: 'api/structattr/oneCreate',
url: 'api/structattr/blurQuery',
method: 'post',
data
})
}
export function blurQuery(data) {
export function oneCreate(data) {
return request({
url: 'api/structattr/blurQuery',
url: 'api/structattr/oneCreate',
method: 'post',
data
})