页面调整

main
FOAM 2025-09-30 12:06:58 +08:00
parent efcda66992
commit 96f8df6017
6 changed files with 82 additions and 132 deletions

View File

@ -116,15 +116,19 @@
</el-select>
</el-form-item>
-->
<el-form-item label="A/C" prop="ac">
<el-input v-model="form.ac" style="width: 180px;" />
</el-form-item>
<el-form-item label="加工内容" prop="contents">
<el-input v-model="form.contents" style="width: 180px;" />
</el-form-item>
<el-form-item label="收容数" prop="srs">
<el-input v-model="form.srs" style="width: 180px;" />
</el-form-item>
<el-form-item label="单用" prop="singles">
<el-input v-model="form.singles" style="width: 180px;" />
</el-form-item>
<el-form-item label="A/C" prop="ac">
<el-input v-model="form.ac" style="width: 180px;" />
</el-form-item>
<el-form-item label="纳所" prop="ns">
<el-input v-model="form.ns" style="width: 180px;" />
</el-form-item>

View File

@ -204,7 +204,7 @@ export default {
title: '物料', url: 'api/item', idField: 'id', sort: 'id,desc', crudMethod: { ...crudItem }, optShow: {
add: true,
edit: false,
del: false,
del: true,
reset: true,
download: true
}

View File

@ -238,7 +238,7 @@ export default {
optShow: {
add: true,
edit: false,
del: false,
del: true,
reset: true,
download: true
},

View File

@ -56,7 +56,7 @@ export default {
kwfenzuAll: [],
kwfenzu: [],
qrOptions: {
width: 60, //
width: 100, //
margin: 0, //
errorCorrectionLevel: 'H' //
},
@ -94,8 +94,8 @@ export default {
this.kkkk2=res;
this.kwfenzu=[]
for (let i = 0; i < this.kkkk2.length; i += 14) {
this.kwfenzu.push(this.kkkk2.slice(i, i + 14));
for (let i = 0; i < this.kkkk2.length; i += 4) {
this.kwfenzu.push(this.kkkk2.slice(i, i + 4));
}
console.log(kwfenzu)
});
@ -147,21 +147,21 @@ body {
}
.td-item-value{
font-size: 22pt;
font-size: 46pt;
font-weight: bold;
text-align: center;
border: #000000 2px solid;
}
.td-item-value2{
font-size: 13pt;
font-size: 30pt;
font-weight: bold;
text-align: center;
border: #000000 2px solid;
}
.td-item-value3{
font-size: 9pt;
font-size: 12pt;
font-weight: bold;
text-align: center;
border: #000000 2px solid;
@ -169,8 +169,8 @@ body {
.qr-code {
padding: 1mm;
width: 22mm; /* 控制显示大小 */
height: 22mm;
width: 35mm; /* 控制显示大小 */
height: 35mm;
image-rendering: crisp-edges; /* 保持清晰度 */
display: block;
margin: 0 auto;
@ -179,22 +179,22 @@ body {
.label-table {
background: #00a0e9;
width: 100mm;
height: 40mm;
width: 190mm;
height: 60mm;
background: #ffffff;
border-collapse: collapse;
font-size: 13px;
font-size: 16px;
table-layout: fixed;
}
.grid-container {
display: grid;
grid-template-columns: repeat(2, 1fr); /* 4列 */
grid-template-rows: repeat(7, 1fr); /* 7行 */
grid-template-columns: repeat(1, 1fr); /* 4列 */
grid-template-rows: repeat(4, 1fr); /* 7行 */
width: 100%;
height: 100%;
background: #ffffff;
gap: 1mm 1mm; /* 标签之间的间隙 */
gap: 3mm 3mm; /* 标签之间的间隙 */
}
</style>

View File

@ -88,33 +88,33 @@
width="30%"
:close-on-click-modal="false"
>
<el-form ref="ywFrom" :rules="ywRules" :model="inventoryButton.inventoryYW"
<el-form ref="ywFrom" :rules="ywRules" :model="ywFrom"
size="small" label-width="90px"
>
<el-form-item label="品番">
<el-input v-model="inventoryButton.inventoryYW.inventory.itemKey.item.code" placeholder="品番"
<el-input v-model="ywFrom.inventory.itemKey.item.code" placeholder="品番"
:disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="货品名称">
<el-input v-model="inventoryButton.inventoryYW.inventory.itemKey.item.name" placeholder="货品名称"
<el-input v-model="ywFrom.inventory.itemKey.item.name" placeholder="货品名称"
:disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="原库位">
<el-input v-model="inventoryButton.inventoryYW.inventory.point.name" placeholder="原库位" :disabled="true"
<el-input v-model="ywFrom.inventory.point.name" placeholder="原库位" :disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="库存数">
<el-input v-model="inventoryButton.inventoryYW.inventory.quantity" placeholder="库存数" :disabled="true"
<el-input v-model="ywFrom.inventory.quantity" placeholder="库存数" :disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="目标点位" prop="dstPoint">
<el-select v-model="inventoryButton.inventoryYW.dstPoint" value-key="id" placeholder="目标点位"
<el-select v-model="ywFrom.dstPoint" value-key="id" placeholder="目标点位"
style="width: 220px;" clearable filterable
>
<el-option
@ -127,14 +127,14 @@
</el-select>
</el-form-item>
<el-form-item label="移位数量" prop="rmNumber">
<el-input v-model="inventoryButton.inventoryYW.rmNumber" placeholder="库存数" clearable
<el-input v-model="ywFrom.rmNumber" placeholder="库存数" clearable
style="width: 220px;"
></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="ywTF = false"> </el-button>
<el-button type="primary" @click="planPickSaveM(inventoryButton)"> </el-button>
<el-button type="primary" @click="planPickSaveM(ywFrom)"> </el-button>
</span>
</el-dialog>
<!-- 箱单移位-->
@ -200,7 +200,7 @@
<el-table-column prop="itemKey.propC1" label="批次号" width="150"/>
<el-table-column prop="itemKey.propC2" label="税别"/>
<el-table-column prop="itemKey.item.extendStr2" label="保管期限"/>
<!-- <el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
<el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
width="150px" align="center" fixed="right"
>
<template slot-scope="scope">
@ -220,7 +220,7 @@
>
</udOperation>
</template>
</el-table-column>-->
</el-table-column>
</el-table>
<!--分页组件-->
<div style="float: right;">
@ -317,12 +317,11 @@ export default {
rmNumber: { required: true, message: '移位数量必填', trigger: 'blur' },
},
ywTF: false,
inventoryButton: {
inventoryYW: {
ywFrom: {
inventory: { itemKey: { item: {} }, point: {} },
dstPoint: {},
id: null,
rmNumber: 0
}
},
pointOptions: [],
xdMoveFromFlag: false,
@ -371,7 +370,8 @@ export default {
this.crud.toQuery()
},
ywFTM(data){
this.inventoryButton.inventoryYW.inventory = data;
this.ywFrom.inventory = data;
this.ywFrom.id=data.id;
this.ywTF=true;
},
planPickSaveM(data){
@ -380,8 +380,8 @@ export default {
knywInventory(data).then(res=>{
this.ywTF = false;
this.$message.success(res)
this.inventoryButton.inventoryYW.rmNumber=0;
this.inventoryButton.inventoryYW.dstPoint= { };
this.ywFrom.rmNumber=0;
this.ywFrom.dstPoint= { };
this.crud.toQuery()
})
} else {

View File

@ -2,26 +2,15 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<label class="el-form-item-label" v-show="false"></label>
<el-select v-show="false" v-model="query.itemCode" @focus="getItem" value-key="id" filterable multiple
placeholder="请选择物料" style="width: 150px;" @keyup.enter.native="crud.toQuery"
>
<el-option
v-for="item in items"
:key="item.id"
:label="item.code"
:value="item.code"
/>
</el-select>
<!--
<el-input v-model="query.itemCode" clearable placeholder="请输入物料编码" style="width: 140px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-->
<!-- <label class="el-form-item-label">物料编码</label>-->
<el-input v-model="query.itemCodeOne" clearable placeholder="品番编码" style="width: 150px;"
<el-input v-model="query.itemCodeOne" clearable placeholder="品番" style="width: 150px;"
@keyup.enter.native="crud.toQuery"
/>
<!-- <label class="el-form-item-label">物料名称</label>-->
<el-input v-model="query.itemName" clearable placeholder="品" style="width: 150px;"
<el-input v-model="query.itemName" clearable placeholder="品名" style="width: 150px;"
@keyup.enter.native="crud.toQuery"
/>
@ -49,18 +38,10 @@
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期"
></el-date-picker>
<el-select v-model="query.areaNames" value-key="id" clearable placeholder="库区" style="width: 180px" filterable multiple reserve-keyword="true" >
<el-option
v-for="item in areaOptions"
:key="item.id"
:label="item.name"
:value="item.name"
>
<span style="float: left;width: 60px" >{{ item.code }}</span>
<span style="width: 200px; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option>
</el-select>
<el-checkbox label="库存预警" v-model="query.kcyj"></el-checkbox>
<AreaSelect v-model="query.areaName" :return-type="'value'" :return-value-key="'name'" :bexb="true"
class="filter-item" placeholder="库区" style="width: 155px;"
/>
<rrOperation :crud="crud"/>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name">
@ -85,53 +66,43 @@
width="30%"
:close-on-click-modal="false"
>
<el-form ref="ywFrom" :rules="ywRules" :model="inventoryButton.inventoryYW"
<el-form ref="ywFrom" :rules="ywRules" :model="ywFrom"
size="small" label-width="90px"
>
<el-form-item label="品番">
<el-input v-model="inventoryButton.inventoryYW.inventory.itemKey.item.code" placeholder="品番"
<el-input v-model="ywFrom.item_code" placeholder="品番"
:disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="货品名称">
<el-input v-model="inventoryButton.inventoryYW.inventory.itemKey.item.name" placeholder="货品名称"
<el-input v-model="ywFrom.item_name" placeholder="货品名称"
:disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="原库位">
<el-input v-model="inventoryButton.inventoryYW.inventory.point.name" placeholder="原库位" :disabled="true"
<el-input v-model="ywFrom.point_code" placeholder="原库位" :disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="库存数">
<el-input v-model="inventoryButton.inventoryYW.inventory.quantity" placeholder="库存数" :disabled="true"
<el-input v-model="ywFrom.quantity" placeholder="库存数" :disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="目标点位" prop="dstPoint">
<el-select v-model="inventoryButton.inventoryYW.dstPoint" value-key="id" placeholder="目标点位"
style="width: 220px;" clearable filterable
>
<el-option
v-for="item in pointOptions"
:key="item.code"
:label="item.code"
:value="item"
>
</el-option>
</el-select>
<el-form-item label="目标库位" prop="zPoint">
<PointSelect :value-key="'id'" v-model="ywFrom.dstPoint" :point_type="'ZZKW'" :immediate="true"/>
</el-form-item>
<el-form-item label="移位数量" prop="rmNumber">
<el-input v-model="inventoryButton.inventoryYW.rmNumber" placeholder="库存数" clearable
<el-input v-model="ywFrom.rmNumber" placeholder="库存数" clearable
style="width: 220px;"
></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="ywTF = false"> </el-button>
<el-button type="primary" @click="planPickSaveM(inventoryButton)"> </el-button>
<el-button type="primary" @click="planPickSaveM(ywFrom)"> </el-button>
</span>
</el-dialog>
<!--表单组件-->
@ -140,10 +111,10 @@
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="110px">
<el-form-item label="品番">
<el-input v-model="form.itemKey.item.code" style="width: 300px;" placeholder="品番" :disabled="true"/>
<el-input v-model="form.item_code" style="width: 300px;" placeholder="品番" :disabled="true"/>
</el-form-item>
<el-form-item label="货品名" prop="name">
<el-input v-model="form.itemKey.item.name" style="width: 300px;" placeholder="品名" clearable/>
<el-input v-model="form.item_name" style="width: 300px;" placeholder="品名" clearable/>
</el-form-item>
<el-form-item label="调整后的数量" prop="quantity">
<el-input v-model="form.quantity" style="width: 300px;" placeholder="调整后的数量" clearable/>
@ -174,9 +145,6 @@
<el-form-item label="数量">
<el-input v-model="cxjlFrom.order_qty" />
</el-form-item>
<!--<el-form-item label="指示工厂">
<el-input v-model="cxjlFrom.gw_code" />
</el-form-item>-->
<el-form-item label="库区">
<el-input v-model="cxjlFrom.gw_name" />
</el-form-item>
@ -203,21 +171,21 @@
>
<el-table-column type="selection" width="50"/>
<el-table-column prop="id" label="序号" align="center"/>
<!--<el-table-column prop="area.code" label="库区" width="80"/>-->
<el-table-column prop="area.name" label="库区" width="200"/>
<el-table-column prop="point.code" label="库位号" align="center"/>
<el-table-column prop="itemKey.item.code" label="品番"/>
<el-table-column prop="itemKey.item.name" label="品番名称"/>
<el-table-column prop="area_name" label="库区" width="200"/>
<el-table-column prop="point_code" label="库位号" align="center"/>
<el-table-column prop="item_code" label="品番"/>
<el-table-column prop="item_name" label="品名"/>
<el-table-column prop="prop_c2" label="税别"/>
<el-table-column prop="quantity" label="数量"/>
<!--<el-table-column prop="zzkw.code" label="制造库位" align="center"/>
<el-table-column prop="area.pointCode" label="缓存库位" align="center"/>-->
<el-table-column prop="itemKey.propC2" label="税别"/>
<el-table-column prop="point.invMin" label="库存下限">
<el-table-column prop="inv_min" label="库存下限"/>
<el-table-column prop="kcyj_qty" label="库存不足数">
<template slot-scope="scope">
<div v-if="scope.row.point.invMin>scope.row.quantity" style="background: #ff9292">{{ scope.row.point.invMin }}</div>
<div v-if="scope.row.point.invMin<=scope.row.quantity">{{ scope.row.point.invMin }}</div>
<div v-if="scope.row.kcyj_qty>0" style="background: #ff9292">{{ scope.row.kcyj_qty }}</div>
<div v-if="scope.row.kcyj_qty<=0">{{ scope.row.kcyj_qty }}</div>
</template>
</el-table-column>
<el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
width="150px" align="center" fixed="right"
>
@ -264,6 +232,8 @@ import {download} from "@/api/data";
import {downloadFile} from "@/utils";
import BomAccountPointSelect from "@/views/generic-component/BomAccountPointSelect.vue";
import {zzjl} from "@/api/pickDetail";
import AreaSelect from "@/views/generic-component/AreaSelect.vue";
import PointSelect from "@/views/generic-component/PointSelect.vue";
const defaultForm = {
id: null,
billCode: null,
@ -291,7 +261,7 @@ const defaultForm = {
}
export default {
name: 'InvZz',
components: {BomAccountPointSelect, pagination, crudOperation, rrOperation, udOperation },
components: {PointSelect, AreaSelect, BomAccountPointSelect, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@ -300,9 +270,9 @@ export default {
bexb:true,
pointType:'ZZKW'
},
areaOptions: [],
title: '库存信息',
url: 'api/inventory',
url: 'api/inventory/queryInventoryZz',
downurl: 'api/inventory',
idField: 'id',
sort: 'id,desc',
crudMethod: { ...crudInventory },
@ -335,43 +305,25 @@ export default {
rmNumber: { required: true, message: '移位数量必填', trigger: 'blur' },
},
ywTF: false,
inventoryButton: {
inventoryYW: {
inventory: { itemKey: { item: {} }, point: {} },
ywFrom: {
//inventory: {id},
dstPoint: {},
rmNumber: 0
}
rmNumber: 0,
id:null,item_code:null,item_name:null,point_code:null,quantity:null
},
pointOptions: [],
cxjlFromFlag: false,
cxjlFrom: { bom_account_id: null,order_qty:0, item_code:null, item_name:null, zzkw_id:null, zzkw_code:null, gw_code:null, gw_name:null, status:null, remark:null,srs:0 }
}
},
mounted() {
this.getAreaOptionsAll()
this.infoData()
},
methods: {
// false
[CRUD.HOOK.beforeRefresh]() {
return true
},
infoData(){
queryPointList({}).then(res=>{
this.pointOptions = res;
})
},
getItem() {
getItems({}).then(res => {
this.items = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
deleteDataM(id) {//
let ids = []
ids.push(id)
@ -390,7 +342,7 @@ export default {
this.crud.toQuery()
},
ywFTM(data){
this.inventoryButton.inventoryYW.inventory = data;
this.ywFrom = data;
this.ywTF=true;
},
planPickSaveM(data){
@ -399,8 +351,8 @@ export default {
knywInventory(data).then(res=>{
this.ywTF = false;
this.$message.success(res)
this.inventoryButton.inventoryYW.rmNumber=0;
this.inventoryButton.inventoryYW.dstPoint= { };
this.ywFrom.rmNumber=0;
this.ywFrom.dstPoint= { };
this.crud.toQuery()
})
} else {
@ -410,21 +362,15 @@ export default {
})
},
downXbBtn(){
console.log(123)
console.log(this.crud.downurl)
this.crud.downloadLoading = true
download(this.crud.url + '/downloadXb', this.crud.getQueryParams()).then(result => {
download('api/inventory/downloadZz', this.crud.getQueryParams()).then(result => {
downloadFile(result, this.crud.title + '数据', 'xlsx')
this.crud.downloadLoading = false
}).catch(() => {
this.crud.downloadLoading = false
})
},
//
getAreaOptionsAll() {
queryAreaList({bexb:true,enabled:true}).then(res => {
this.areaOptions = res
})
},
getChangeVule(dben) {
this.cxjlFrom.order_qty=dben.srs;
this.cxjlFrom.item_code=dben.item_code;