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

Merge branch 'master' of http://47.111.78.178:8012/root/yinnihailiang_one

Browse Source 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
This commit is contained in:
郑旭明\73939
2026-02-10 16:10:36 +08:00
parent 0cc358b472 3f836d4e53
commit 75afc80a64
30 changed files with 663 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,8 +93,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
</el-col>
<el-col :span="8" />
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">

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

@@ -11,16 +11,16 @@
<span slot="title" class="dialog-footer">
<div class="crud-opts2">
<span class="el-dialog__title2">{{$t('common.outboundAllocation')}}</span>
<span class="el-dialog__title2">{{ $t('common.outboundAllocation') }}</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button slot="left" type="info" @click="dialogVisible = false">{{$t('common.close')}}</el-button>
<el-button slot="left" type="info" @click="dialogVisible = false">{{ $t('common.close') }}</el-button>
</span>
</div>
</span>
<div class="crud-opts2">
<span class="role-span">{{$t('common.outboundDetails')}}</span>
<span class="role-span">{{ $t('common.outboundDetails') }}</span>
<div class="crud-opts-form">
<el-form ref="form" :inline="true" :model="form" size="mini">
<el-form-item :label="$t('common.warehouseArea')" prop="gender2">
@@ -46,7 +46,7 @@
size="mini"
@click="allDiv()"
>
{{$t('common.allocateAll')}}
{{ $t('common.allocateAll') }}
</el-button>
<el-button
slot="left"
@@ -57,7 +57,7 @@
size="mini"
@click="allCancel()"
>
{{$t('common.cancelAll')}}
{{ $t('common.cancelAll') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type !== '1011'"
@@ -70,7 +70,7 @@
:disabled="button1"
@click="oneDiv()"
>
{{$t('common.autoAllocate')}}
{{ $t('common.autoAllocate') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type !== '1011'"
@@ -83,7 +83,7 @@
:disabled="button2"
@click="oneCancel()"
>
{{$t('common.autoCancel')}}
{{ $t('common.autoCancel') }}
</el-button>
<el-button
slot="left"
@@ -95,7 +95,7 @@
:disabled="button3"
@click="openStructIvt"
>
{{$t('common.manualAllocate')}}
{{ $t('common.manualAllocate') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type !== '1011'"
@@ -107,7 +107,7 @@
size="mini"
@click="allSetPointAllDtl"
>
{{$t('common.oneClickSetting')}}
{{ $t('common.oneClickSetting') }}
</el-button>
</span>
</div>
@@ -140,28 +140,28 @@
</el-table>
</el-card>
<div class="crud-opts2">
<span class="role-span">{{$t('common.allocationDetails')}}</span>
<span class="role-span">{{ $t('common.allocationDetails') }}</span>
<div class="crud-opts-form">
<el-form ref="form2" :inline="true" :model="form2" size="mini">
<el-form-item :label="$t('common.toBeAllocated')" prop="unassign_qty" />
<el-input-number
v-model="form2.unassign_qty"
style="width: 100px;"
:controls="false"
:precision="3"
:min="0"
disabled
/>
<el-input-number
v-model="form2.unassign_qty"
style="width: 100px;"
:controls="false"
:precision="3"
:min="0"
disabled
/>
</el-form-item>
<el-form-item :label="$t('common.alreadyAllocated')" prop="assign_qty" />
<el-input-number
v-model="form2.assign_qty"
style="width: 100px;"
:controls="false"
:precision="3"
:min="0"
disabled
/>
<el-input-number
v-model="form2.assign_qty"
style="width: 100px;"
:controls="false"
:precision="3"
:min="0"
disabled
/>
</el-form-item>
<el-form-item v-if="mstrow.stor_id !== '1582991156504039455'" :label="$t('common.outboundPoint')" prop="point_code">
<el-select
@@ -180,11 +180,11 @@
</el-select>
</el-form-item>
<el-form-item prop="checked">
<el-checkbox v-if="mstrow.stor_id !== '1582991156504039455'" v-model="checked">{{$t('common.isAbnormalOutbound')}}</el-checkbox>
<el-checkbox v-if="mstrow.stor_id !== '1582991156504039455'" v-model="checked">{{ $t('common.isAbnormalOutbound') }}</el-checkbox>
</el-form-item>
<el-form-item :label="$t('common.overdueShipment') + ':'" prop="is_overdue">
<el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">{{$t('common.doNotShipOverdue')}}</el-radio>
<el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">{{$t('common.shipOverdue')}}</el-radio>
<el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">{{ $t('common.doNotShipOverdue') }}</el-radio>
<el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">{{ $t('common.shipOverdue') }}</el-radio>
</el-form-item>
<!--<el-form-item label="超期数量:" prop="assign_qty" v-if="rowmst.is_overdue === '1'">
<el-input-number
@@ -223,7 +223,7 @@
:disabled="button4"
@click="oneSetPoint2"
>
{{$t('common.setSite')}}
{{ $t('common.setSite') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type !== '1011'"
@@ -236,7 +236,7 @@
size="mini"
@click="allSetPoint"
>
{{$t('common.oneClickSetting')}}
{{ $t('common.oneClickSetting') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type === '1011'"
@@ -249,7 +249,7 @@
size="mini"
@click="saveUpdate"
>
{{$t('common.saveChanges')}}
{{ $t('common.saveChanges') }}
</el-button>
</span>
</div>