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

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
zhangzq
2025-04-10 19:44:59 +08:00
parent a969d2f707 74a04a45bc
commit 99ed91b01c
10 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
View File

@@ -47,7 +47,6 @@
</crudOperation>
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
@@ -109,6 +108,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="干燥剂数量:" prop="desiccant_num">
<el-input-number :precision="0" :step="1" :min="0" :max="100" v-model="form.desiccant_num" size="mini" :controls="true" style="width: 200px" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
@@ -174,13 +178,14 @@
>
<el-table-column prop="box_type" sortable label="木箱类型" />
<el-table-column prop="box_name" label="木箱描述" width="150" />
<el-table-column prop="lash_num" label="捆扎模版" width="150" />
<el-table-column prop="lash_num_one" label="一次捆扎次数" width="150" />
<el-table-column prop="lash_num_tow" label="二次捆扎次数" width="150" />
<el-table-column prop="need_lash_one" label="是否一次捆扎" width="150" :formatter="formatOne" />
<el-table-column prop="need_lash_two" label="是否二次捆扎" width="150" :formatter="formatTwo" />
<el-table-column prop="expend_width" label="叉车取货宽度" width="150" />
<el-table-column prop="box_structure" label="箱体结构" width="150" :formatter="boxType"/>
<el-table-column prop="lash_num" label="捆扎模版" width="100" />
<el-table-column prop="lash_num_one" label="一次捆扎次数" width="100" />
<el-table-column prop="lash_num_tow" label="二次捆扎次数" width="100" />
<el-table-column prop="need_lash_one" label="是否一次捆扎" width="100" :formatter="formatOne" />
<el-table-column prop="need_lash_two" label="是否二次捆扎" width="100" :formatter="formatTwo" />
<el-table-column prop="expend_width" label="叉车取货宽度" width="100" />
<el-table-column prop="box_structure" label="箱体结构" width="100" :formatter="boxType"/>
<el-table-column prop="desiccant_num" label="干燥剂数量" width="100"/>
<el-table-column
v-permission="['admin','sectattr:edit','sectattr:del']"
label="操作"
@@ -218,7 +223,8 @@ const defaultForm = {
lash_num_tow: null,
need_lash_one: '0',
need_lash_two: '0',
box_structure: null
box_structure: null,
desiccant_num: 6
}
export default {
name: 'BoxType',
@@ -231,7 +237,7 @@ export default {
optShow: { add: true, reset: true },
url: 'api/boxtype',
idField: 'box_type',
sort: 'box_type,desc',
sort: '',
crudMethod: { ...crudBoxtype }
})
},
@@ -272,6 +278,9 @@ export default {
updateOne() {
this.dialogVisible2 = true
},
close() {
this.dialogVisible2 = false
},
confirmUpdate() {
crudBoxtype.confirmUpdate(this.formMst).then(res => {
this.dialogVisible2 = false

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

@@ -454,7 +454,7 @@
/>
<el-table-column sortable prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
<el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
<el-table-column prop="width_standard" :formatter="crud.formatNum0" label="客户要求幅宽" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" />
<el-table-column prop="width_standard" :formatter="crud.formatNum3" label="客户要求幅宽" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" />
<el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
<el-table-column
prop="mass_per_unit_area"