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

opt:新增成品库存报表导出、优化中文、优化菜单

Browse Source
This commit is contained in:
郑旭明\73939
2026-02-10 16:09:16 +08:00
parent 9c2f89d04c
commit 0cc358b472
16 changed files with 597 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,29 +86,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('wms.basedata.master.material.materialCategory')" prop="material_type_id">
<el-select
v-model="form.material_type_id"
size="mini"
:placeholder="$t('wms.basedata.master.material.pleaseSelect')"
class="filter-item"
>
<el-option
v-for="item in dict.material_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-form-item :label="$t('wms.basedata.master.material.isEnabled')" prop="is_used">
<el-radio v-model="form.is_used" label="0">{{ $t('wms.basedata.master.material.no') }}</el-radio>
<el-radio v-model="form.is_used" label="1">{{ $t('wms.basedata.master.material.yes') }}</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item :label="$t('wms.basedata.master.material.isEnabled')" prop="is_used">
<el-radio v-model="form.is_used" label="0">{{ $t('wms.basedata.master.material.no') }}</el-radio>
<el-radio v-model="form.is_used" label="1">{{ $t('wms.basedata.master.material.yes') }}</el-radio>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -130,8 +115,6 @@
<el-table-column prop="material_name" :label="$t('wms.basedata.master.material.materialName')" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" :label="$t('wms.basedata.master.material.materialSpecification')" width="140" />
<el-table-column prop="material_model" :label="$t('wms.basedata.master.material.materialModel')" />
<el-table-column prop="class_code" :label="$t('wms.basedata.master.material.materialClassCode')" width="120" />
<el-table-column prop="class_name" :label="$t('wms.basedata.master.material.materialClass')" width="140" />
<el-table-column prop="unit_name" :label="$t('wms.basedata.master.material.measureUnit')" />
<el-table-column prop="standing_time" :label="$t('wms.basedata.master.material.standingTimeMinutes')" width="130px" />
<el-table-column :label="$t('wms.basedata.master.material.enabled')" align="center" prop="is_used">

14
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -639,15 +639,15 @@ export default {
},
oneSetPoint2() {
if (this.form2.point_code === '') {
this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify(this.$t('common.pleaseSelectSiteFirst'), CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.currentDis.point_code) {
this.crud.notify('站点已设置！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify(this.$t('common.siteHasBeenSet'), CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.currentDis.work_status !== '00') {
this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify(this.$t('common.taskAlreadyGenerated'), CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.loadingSetPoint = true
@@ -667,7 +667,7 @@ export default {
allSetPoint() {
if (this.mstrow.stor_id !== '1582991156504039455') {
if (this.form2.point_code === '') {
this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify(this.$t('common.pleaseSelectSiteFirst'), CRUD.NOTIFICATION_TYPE.INFO)
return
}
}
@@ -681,7 +681,7 @@ export default {
this.currentRow.stor_id = this.mstrow.stor_id
checkoutbill.allSetPoint(this.currentRow).then(res => {
this.queryTableDdis(this.currentRow.iostorinvdtl_id)
this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify(this.$t('common.settingSuccessful'), CRUD.NOTIFICATION_TYPE.INFO)
this.loadingSetAllPoint = false
}).catch(() => {
this.loadingSetAllPoint = false
@@ -709,7 +709,7 @@ export default {
allSetPointAllDtl() {
if (this.mstrow.stor_id !== '1582991156504039455') {
if (this.form2.point_code === '') {
this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify(this.$t('common.pleaseSelectSiteFirst'), CRUD.NOTIFICATION_TYPE.INFO)
return
}
}
@@ -723,7 +723,7 @@ export default {
}
checkoutbill.allSetPoint(data).then(res => {
this.queryTableDdis(this.currentRow.iostorinvdtl_id)
this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify(this.$t('common.settingSuccessful'), CRUD.NOTIFICATION_TYPE.INFO)
this.loadingSetAllPoint = false
}).catch(() => {
this.loadingSetAllPoint = false

2
lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
View File

@@ -459,7 +459,7 @@ export default {
data.end_time = this.crud.query.createTime[1]
}
this.showDtlLoading = true
download('/api/in/InQuery/download2', data).then(result => {
download('/api/in/InQuery/download3', data).then(result => {
downloadFile(result, '成品入库查询', 'xlsx')
this.showDtlLoading = false
}).catch(() => {