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

代码合并

Browse Source
This commit is contained in:
zhouz
2024-06-27 15:23:15 +08:00
parent cba03a45ad 39f10ae18f
commit cab08052ec
110 changed files with 4905 additions and 1381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,8 +60,8 @@
全部取消
</el-button>
<el-button
slot="left"
v-if="this.mstrow.bill_type !== '1011'"
slot="left"
class="filter-item"
:loading="loadingAlldiv"
type="primary"
@@ -73,8 +73,8 @@
自动分配
</el-button>
<el-button
slot="left"
v-if="this.mstrow.bill_type !== '1011'"
slot="left"
class="filter-item"
type="primary"
icon="el-icon-check"
@@ -98,8 +98,8 @@
手工分配
</el-button>
<el-button
slot="left"
v-if="this.mstrow.bill_type !== '1011'"
slot="left"
class="filter-item"
type="warning"
:loading="loadingSetAllPoint"
@@ -163,7 +163,7 @@
disabled
/>
</el-form-item>
<el-form-item label="出库点" prop="point_code" v-if="mstrow.stor_id !== '1582991156504039455'">
<el-form-item v-if="mstrow.stor_id !== '1582991156504039455'" label="出库点" prop="point_code">
<el-select
v-model="form2.point_code"
clearable
@@ -198,7 +198,7 @@
</el-form-item>-->
</el-form>
</div>
<span class="crud-opts-right2">
<span v-if="mstrow.stor_id !== '1582991156504039455'" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<!-- <el-button
@@ -213,36 +213,34 @@
设置站点
</el-button>-->
<el-button
slot="left"
v-if="this.mstrow.bill_type !== '1011'"
slot="left"
class="filter-item"
:loading="loadingSetPoint"
type="warning"
icon="el-icon-check"
size="mini"
v-if="mstrow.stor_id !== '1582991156504039455'"
:disabled="button4"
@click="oneSetPoint2"
>
设置站点
</el-button>
<el-button
slot="left"
v-if="this.mstrow.bill_type !== '1011'"
slot="left"
class="filter-item"
:loading="loadingSetAllPoint"
type="warning"
icon="el-icon-check"
:disabled="button5"
v-if="mstrow.stor_id !== '1582991156504039455'"
size="mini"
@click="allSetPoint"
>
一键设置
</el-button>
<el-button
slot="left"
v-if="this.mstrow.bill_type === '1011'"
slot="left"
class="filter-item"
:loading="loadingSetAllPoint"
type="warning"
@@ -291,10 +289,10 @@
<el-table-column prop="box_no" label="木箱号" width="250px" :min-width="flexWidth('box_no',crud.data,'木箱号')" />
<el-table-column prop="pcsn" label="子卷批次号" width="150px" :min-width="flexWidth('pcsn',crud.data,'子卷批次号')" />
<el-table-column prop="sap_pcsn" label="sap批次号" width="150px" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次号')" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" width="120px" :min-width="flexWidth('plan_qty',crud.data,'出库重量')" >
<el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" width="120px" :min-width="flexWidth('plan_qty',crud.data,'出库重量')">
<template scope="scope">
<el-input-number v-show="mstrow.bill_type === '1011'" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 90px" />
<span v-show="mstrow.bill_type !== '1011'" >{{ parseFloat(scope.row.plan_qty).toFixed(3) }}</span>
<span v-show="mstrow.bill_type !== '1011'">{{ parseFloat(scope.row.plan_qty).toFixed(3) }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="struct_code" width="150px" label="仓位编码" align="center" />