Skip to content

P
pda-ui
Commit 75029b0f authored by 张海景's avatar 张海景
Browse files
Options

update:修改仓储管理的排版

parent 553dd49f
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 112 deletions
src/views/mes/pro/request/index.vue
View file @ 75029b0f
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="产品编号" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
......@@ -52,7 +52,6 @@
<el-form-item label="创建时间">
<el-date-picker
v-model="daterangePurchaseDate"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
......@@ -156,7 +155,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -167,13 +166,13 @@
<!-- 添加或修改领料申请对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form"
:model="form"
<el-form ref="form"
:model="form"
:rules="rules"
:disabled="form.materialRequestId&&optType!='edit'"
:disabled="form.materialRequestId&&optType!='edit'"
label-width="80px">
<el-row>
<el-col :span="12">
<el-col :span="12">
<el-form-item label="产品编号" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品编号" />
</el-form-item>
......@@ -187,7 +186,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="领料类型" prop="applyType">
<el-select v-model="form.applyType" placeholder="请选择领用类型">
<el-select style="width:100%;" v-model="form.applyType" placeholder="请选择领用类型">
<el-option
v-for="dict in dict.type.pro_requisition_type"
:key="dict.value"
......@@ -198,7 +197,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领用数量数量" prop="applyNum">
<el-form-item label="领用数量" prop="applyNum">
<el-input v-model="form.applyNum" placeholder="请输入申请数量" />
</el-form-item>
</el-col>
......@@ -211,7 +210,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="创建人" prop="createBy">
<el-input v-model="form.createBy" type="textarea" placeholder="请输入创始人" />
<el-input v-model="form.createBy" placeholder="请输入创始人" />
</el-form-item>
</el-col>
</el-row>
......@@ -273,16 +272,16 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
applyNo: null,
applyNo: null,
itemId: null,
itemName: null,
itemName: null,
taskId: null,
arrangeCode: null,
createTime: null,
applyNum: null,
attr1: null,
attr2: null,
attr3: null,
createTime: null,
applyNum: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
workorderCode: null, },
// 表单参数
......@@ -319,25 +318,25 @@ export default {
reset() {
this.daterangePurchaseDate = [];
this.form = {
materialRequestId: null,
applyNo: null,
materialRequestId: null,
applyNo: null,
itemId: null,
itemName: null,
taskId: null,
itemName: null,
taskId: null,
applyNum: null,
arrangeCode: null,
workorderCode: null,
createTime: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
createTime: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
......
src/views/mes/pro/return/index.vue
View file @ 75029b0f
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="产品编号" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
......@@ -60,7 +60,6 @@
<el-form-item label="创建时间">
<el-date-picker
v-model="daterangePurchaseDate"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
......@@ -164,7 +163,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -266,23 +265,23 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
applyNo: null,
itemId: null,
applyNo: null,
itemId: null,
taskId: null,
itemCode: null,
itemName: null,
createBy: null,
createTime: null,
issueLineId: null,
workOrderId: null,
createTime: null,
issueLineId: null,
workOrderId: null,
workorderCode: null,
isQualified: null,
backNum: null,
batchNo: null,
packNo: null,
attr1: null,
attr2: null,
attr3: null,
isQualified: null,
backNum: null,
batchNo: null,
packNo: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null, },
// 表单参数
form: {},
......@@ -317,30 +316,30 @@ export default {
// 表单重置
reset() {
this.form = {
materialReturnId: null,
applyNo: null,
itemId: null,
taskId: null,
issueLineId: null,
workOrderId: null,
workorderCode: null,
materialReturnId: null,
applyNo: null,
itemId: null,
taskId: null,
issueLineId: null,
workOrderId: null,
workorderCode: null,
backNum: null,
itemCode: null,
itemName: null,
createBy: null,
createTime: null,
isQualified: null,
batchNo: null,
packNo: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
createTime: null,
isQualified: null,
batchNo: null,
packNo: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
......
src/views/mes/wm/package/index.vue
View file @ 75029b0f
......@@ -62,7 +62,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="packageList"
<el-table v-loading="loading" :data="packageList"
row-key="packageId"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
......@@ -120,7 +120,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -135,18 +135,17 @@
<el-row>
<el-col :span="12">
<el-row>
<el-col :span="16">
<el-col :span="24">
<el-form-item label="装箱单编号" prop="packageCode">
<el-input v-model="form.packageCode" placeholder="请输入装箱单编号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
<div style="display: flex;align-items: center;">
<el-input v-model="form.packageCode" placeholder="请输入装箱单编号" />
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch>
style="width: 175px;margin-left: 10px;"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch>
</div>
</el-form-item>
</el-col>
</el-row>
......@@ -553,4 +552,4 @@ export default {
height: 200px;
}
</style>
\ No newline at end of file
</style>
src/views/mes/wm/productrecpt/index.vue
View file @ 75029b0f
......@@ -131,7 +131,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -144,18 +144,17 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="入库单编号" prop="recptCode">
<el-input v-model="form.recptCode" placeholder="请输入入库单编号" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch>
<div style="display: flex;align-items: center;">
<el-input v-model="form.recptCode" placeholder="请输入入库单编号" />
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
style="width: 175px;margin-left: 10px;"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -188,7 +187,7 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
......@@ -197,13 +196,13 @@
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider>
<el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.recptId !=null" class="box-card">
<Productrecptline :recptId="form.recptId" :optType="optType" :workorderId="form.workorderId" :itemId="form.itemId"></Productrecptline>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -302,16 +301,16 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
getTreeList().then( response =>{
this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
......@@ -459,7 +458,7 @@ export default {
}
},
//选择默认的仓库、库区、库位
handleWarehouseChanged(obj){
handleWarehouseChanged(obj){
if(obj !=null){
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
......
src/views/mes/wm/warehouse/index.vue
View file @ 75029b0f
......@@ -105,7 +105,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -118,18 +118,17 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="仓库编码" prop="warehouseCode">
<el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
<div style="display: flex;align-items: center;">
<el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
style="width:175px;margin-left:10px;"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -357,7 +356,7 @@ export default {
});
}else{
this.form.warehouseCode = null;
}
}
}
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment