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

代码合并

Browse Source
This commit is contained in:
ldj_willow
2022-10-27 09:09:04 +08:00
parent 513ee5313b
commit e286948f47
9 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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

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

@@ -143,12 +143,12 @@ export default {
return {
rowspan: 2,
colspan: 1
};
}
} else {
return {
rowspan: 0,
colspan: 0
};
}
}
}
},

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

@@ -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',

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

@@ -159,7 +159,7 @@
</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>

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

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

@@ -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',