root/longdianningxing
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

2
lms/nladmin-ui/src/utils/request.js
View File

@@ -18,7 +18,7 @@ const service = axios.create({
service.interceptors.request.use(
config => {
if (getToken()) {
config.headers['Authorization'] = getToken() ? 'Bearer ' + getToken() : undefined // 让每个请求携带自定义token 请根据实际情况自行修改
config.headers['Authorization'] = 'Bearer ' + getToken()
}
config.headers['Content-Type'] = 'application/json'
return config

9
lms/nladmin-ui/src/views/tools/storage/index.vue
View File

@@ -57,7 +57,7 @@
<el-table-column prop="name" label="文件名">
<template slot-scope="scope">
<el-popover
:content="'file/' + scope.row.type + '/' + scope.row.realName"
:content="'file/' + scope.row.type + '/' + scope.row.real_name"
placement="top-start"
title="路径"
width="200"
@@ -65,7 +65,7 @@
>
<a
slot="reference"
:href="baseURLStr + '/file/' + scope.row.type + '/' + scope.row.realName"
:href="baseURLStr + '/file/' + scope.row.type + '/' + scope.row.real_name"
class="el-link--primary"
style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
target="_blank"
@@ -78,8 +78,8 @@
<el-table-column prop="path" label="预览图">
<template slot-scope="{row}">
<el-image
:src=" baseURLStr + '/file/' + row.type + '/' + row.realName"
:preview-src-list="[baseURLStr + '/file/' + row.type + '/' + row.realName]"
:src=" baseURLStr + '/file/' + row.type + '/' + row.real_name"
:preview-src-list="[baseURLStr + '/file/' + row.type + '/' + row.real_name]"
fit="contain"
lazy
class="el-avatar"
@@ -112,7 +112,6 @@ import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker'
const defaultForm = { id: null, name: '' }
export default {
components: { pagination, crudOperation, rrOperation, DateRangePicker },

92
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -174,7 +174,7 @@
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud"/>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -201,23 +201,36 @@
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="struct_code" label="仓位编码"
:min-width="flexWidth('struct_code',crud.data,'仓位编码')"
<el-table-column type="selection" width="55" />
<el-table-column
prop="struct_code"
label="仓位编码"
:min-width="flexWidth('struct_code',crud.data,'仓位编码')"
/>
<el-table-column prop="struct_name" label="仓位名称"
:min-width="flexWidth('struct_name',crud.data,'仓位名称')"
<el-table-column
prop="struct_name"
label="仓位名称"
:min-width="flexWidth('struct_name',crud.data,'仓位名称')"
/>
<el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')"/>
<el-table-column prop="sect_name" label="库区" :min-width="flexWidth('sect_name',crud.data,'库区')"/>
<el-table-column prop="material_code" label="物料编码"
:min-width="flexWidth('material_code',crud.data,'物料编码')"
<el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
<el-table-column prop="sect_name" label="库区" :min-width="flexWidth('sect_name',crud.data,'库区')" />
<el-table-column
prop="material_code"
label="物料编码"
:min-width="flexWidth('material_code',crud.data,'物料编码')"
/>
<el-table-column prop="material_name" label="物料名称"
:min-width="flexWidth('material_name',crud.data,'物料名称')"
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('material_name',crud.data,'物料名称')"
/>
<!-- <el-table-column prop="region_name" label="下料区域" min-width="120" show-overflow-tooltip />-->
<!-- <el-table-column prop="quality_scode" label="品质类型" min-width="120" show-overflow-tooltip>
@@ -225,26 +238,31 @@
{{ dict.label.ST_QUALITY_SCODE[scope.row.quality_scode] }}
</template>
</el-table-column>-->
<el-table-column prop="package_box_sn" label="木箱码"
:min-width="flexWidth('package_box_sn',crud.data,'木箱码')"
<el-table-column
prop="package_box_sn"
label="木箱码"
:min-width="flexWidth('package_box_sn',crud.data,'木箱码')"
/>
<el-table-column prop="quanlity_in_box" label="子卷数"
:min-width="flexWidth('quanlity_in_box',crud.data,'子卷数')"
<el-table-column
prop="quanlity_in_box"
label="子卷数"
:min-width="flexWidth('quanlity_in_box',crud.data,'子卷数')"
/>
<el-table-column prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')"/>
<el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')"/>
<el-table-column prop="box_weight" label="毛重" :formatter="rounding2"/>
<el-table-column prop="canuse_qty" label="可用数" :formatter="rounding"/>
<el-table-column prop="frozen_qty" label="冻结数" :formatter="rounding"/>
<el-table-column prop="ivt_qty" label="库存数" :formatter="rounding"/>
<el-table-column prop="warehousing_qty" label="待入数" :formatter="rounding"/>
<el-table-column prop="unit_name" label="计量单位"/>
<el-table-column prop="instorage_time" label="入库时间" min-width="150"/>
<el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType"/>
<el-table-column prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')" />
<el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')" />
<el-table-column prop="box_weight" label="毛重" :formatter="rounding2" />
<el-table-column prop="canuse_qty" label="可用数" :formatter="rounding" />
<el-table-column prop="frozen_qty" label="冻结数" :formatter="rounding" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="rounding" />
<el-table-column prop="warehousing_qty" label="待入数" :formatter="rounding" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="confirm_time" label="入库时间" min-width="150" />
<el-table-column prop="joint_type" label="接头数" min-width="150" />
<el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType" />
<el-table-column prop="stock_age" label="生产时长（天）" min-width="120" />
<el-table-column prop="paper_type" label="管件类型" min-width="150"/>
<el-table-column prop="paper_code" label="管件编码" min-width="150"/>
<el-table-column prop="paper_name" label="管件描述" min-width="250"/>
<el-table-column prop="paper_type" label="管件类型" min-width="150" />
<el-table-column prop="paper_code" label="管件编码" min-width="150" />
<el-table-column prop="paper_name" label="管件描述" min-width="250" />
<el-table-column prop="remark" label="超期原因" min-width="250">
<template scope="scope">
<!-- <el-input v-model="scope.row.remark" style="width: 200px" />-->
@@ -267,16 +285,20 @@
</el-table-column>
<el-table-column align="center" label="操作" width="120" fixed="right">
<template scope="scope">
<el-button type="primary" class="filter-item" size="mini" icon="el-icon-edit"
@click.native.prevent="save(scope.row)"
<el-button
type="primary"
class="filter-item"
size="mini"
icon="el-icon-edit"
@click.native.prevent="save(scope.row)"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<UploadDialog :dialog-show.sync="viewShow" @tableChanged="querytable"/>
<UploadDialog :dialog-show.sync="viewShow" @tableChanged="querytable" />
</div>
</template>

11
lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
View File

@@ -94,6 +94,17 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="query.stor_id === '1582991156504039455'"
slot="right"
class="filter-item"
type="warning"
icon="el-icon-check"
size="mini"
@click="openOneCreate"
>
一键生成
</el-button>
<el-button
v-if="query.stor_id === '1582991156504039455'"
slot="right"

18
lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js
View File

@@ -48,6 +48,14 @@ export function blurQuery(data) {
})
}
export function oneCreate(data) {
return request({
url: 'api/structattr/oneCreate',
method: 'post',
data
})
}
export function tunConfirm(data) {
return request({
url: 'api/structattr/tunConfirm',
@@ -56,4 +64,12 @@ export function tunConfirm(data) {
})
}
export default { add, edit, del, changeActive, tunConfirm }
export function blurQuery(data) {
return request({
url: 'api/structattr/blurQuery',
method: 'post',
data
})
}
export default { add, edit, del, changeActive, oneCreate, blurQuery, tunConfirm }

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" />