Skip to content

M
mes-ui
Commit 956819fd authored by 528360026@qq.com's avatar 528360026@qq.com
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 97d0d917 72e3a538
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 239 deletions
src/api/mes/pro/protask.js
View file @ 956819fd
......@@ -28,10 +28,13 @@ export function listTaskListDetail(query) {
}
// 查询根据任务id获取刀模板
export function getTaskIdMaxProcessTool(query) {
const params = Object.assign({}, query)
const id = query.taskId;
delete params.taskId
return request({
url: `/mes/pro/protask/getMaxProcessTool/${query.taskId}`,
url: `/mes/pro/protask/getMaxProcessTool/${id}`,
method: "get",
params: query,
params
});
}
......
src/views/mes/md/client/index.vue
View file @ 956819fd
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="客户编码" prop="clientCode">
<el-input
v-model="queryParams.clientCode"
......@@ -11,8 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" prop="clientName">
<el-input
v-model="queryParams.clientName"
......@@ -21,8 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户简称" prop="clientNick">
<el-input
v-model="queryParams.clientNick"
......@@ -31,10 +25,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="客户英文名称" prop="clientEn">
<el-input
v-model="queryParams.clientEn"
......@@ -43,14 +33,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="enableFlag">
<el-select
v-model="queryParams.enableFlag"
placeholder="是否启用"
clearable
style="width: 215px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
......@@ -60,14 +47,10 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
......
src/views/mes/md/product/index.vue
View file @ 956819fd
......@@ -362,7 +362,7 @@
<el-col :span="12">
<el-form-item label="单位" prop="unitOfMeasure">
<el-select
style="width: 100%;"
v-model="form.unitOfMeasure"
disabled
v-if="optType == 'view'"
......@@ -377,6 +377,7 @@
</el-select>
<el-select
style="width: 100%;"
v-model="form.unitOfMeasure"
placeholder="请选择单位"
filterable
......
src/views/mes/md/sizegroup/index.vue
View file @ 956819fd
......@@ -141,9 +141,9 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="尺码组类型" label-width="100px" prop="sizeType">
<el-select v-model="form.sizeType" disabled v-if="optType=='view'">
<el-select style="width: 100%;" v-model="form.sizeType" disabled v-if="optType=='view'">
<el-option
v-for="dict in dict.type.size_type"
:key="dict.value"
......@@ -152,7 +152,7 @@
></el-option>
</el-select>
<el-select v-model="form.sizeType" placeholder="请选择尺码组类型" v-else>
<el-select style="width: 100%;" v-model="form.sizeType" placeholder="请选择尺码组类型" v-else>
<el-option
v-for="dict in dict.type.size_type"
:key="dict.value"
......@@ -162,7 +162,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="是否启用" label-width="100px" prop="enableFlag">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
<el-radio
......@@ -183,13 +183,13 @@
</el-row>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="尺码组编码" label-width="100px" prop="sizeGroupCode">
<el-input v-model="form.sizeGroupCode" readonly="readonly" v-if="optType == 'view'"/>
<el-input v-model="form.sizeGroupCode" placeholder="请输入尺码组编码" v-else/>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="尺码组名称" label-width="100px" prop="sizeGroupName">
<el-input v-model="form.sizeGroupName" readonly="readonly" v-if="optType=='view'"/>
<el-input v-model="form.sizeGroupName" placeholder="请输入尺码组名称" v-else/>
......
src/views/mes/md/vendor/index.vue
View file @ 956819fd
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="供应商编码" prop="vendorCode">
<el-input
v-model="queryParams.vendorCode"
......@@ -11,8 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商名称" prop="vendorName">
<el-input
v-model="queryParams.vendorName"
......@@ -21,8 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商简称" prop="vendorNick">
<el-input
v-model="queryParams.vendorNick"
......@@ -31,10 +25,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="英文名称" prop="vendorEn">
<el-input
v-model="queryParams.vendorEn"
......@@ -43,8 +33,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="enableFlag">
<el-select
v-model="queryParams.enableFlag"
......@@ -60,14 +48,10 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
......@@ -130,7 +114,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="供应商编码" align="center" prop="vendorCode" >
<template slot-scope="scope">
<el-button
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:md:vendor:query']"
......@@ -171,7 +155,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -182,20 +166,19 @@
<!-- 添加或修改供应商对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="供应商编码" prop="vendorCode">
<el-input v-model="form.vendorCode" 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.vendorCode" 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">
......@@ -484,7 +467,7 @@ export default {
},
// 表单重置
reset() {
this.form = {
this.form = {
vendorId: null,
vendorCode: null,
vendorName: null,
......@@ -635,7 +618,7 @@ export default {
});
}else{
this.form.vendorCode = null;
}
}
}
}
};
......
src/views/mes/md/workstation/index.vue
View file @ 956819fd
......@@ -8,8 +8,6 @@
v-show="showSearch"
label-width="100px"
>
<el-row>
<el-col :span="8">
<el-form-item label="工作站编码" prop="workstationCode">
<el-input
v-model="queryParams.workstationCode"
......@@ -18,8 +16,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作站名称" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
......@@ -28,8 +24,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在车间名称" prop="workshopName">
<el-select
v-model="queryParams.workshopId"
......@@ -43,10 +37,6 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="所属工序" prop="processName">
<el-select v-model="queryParams.processId" placeholder="请选择工序">
<el-option
......@@ -57,8 +47,6 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button
type="primary"
......@@ -71,8 +59,6 @@
>重置</el-button
>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
......@@ -236,7 +222,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="所在车间" prop="workshopId">
<el-select v-model="form.workshopId" placeholder="请选择车间">
<el-select style="width:100%;" v-model="form.workshopId" placeholder="请选择车间">
<el-option
v-for="item in workshopOptions"
:key="item.workshopId"
......@@ -248,9 +234,9 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="所属工序" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序">
<el-select style="width:100%;" v-model="form.processId" placeholder="请选择工序">
<el-option
v-for="item in processOptions"
:key="item.processId"
......
src/views/mes/pro/request/index.vue
View file @ 956819fd
<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 @ 956819fd
<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/report/index.vue
View file @ 956819fd
......@@ -118,7 +118,7 @@
<el-input v-model="form.name" placeholder="请输入报表名称" />
</el-form-item>
<el-form-item label="报表类型" prop="reportType">
<el-select v-model="form.reportType" placeholder="请选择模板类型">
<el-select style="width:100%;" v-model="form.reportType" placeholder="请选择模板类型">
<el-option
v-for="dict in dict.type.sys_report_type"
:key="dict.value"
......
src/views/mes/tm/toolrequest/index.vue
View file @ 956819fd
......@@ -191,8 +191,8 @@
</el-form-item>
</el-col>
<el-col v-if="optType === 'add'" :span="12">
<el-form-item label="任务排产单" prop="taskId">
<el-input v-model="form.taskId" placeholder="请选择任务排产单"
<el-form-item label="任务排产单" prop="taskWorkunitId">
<el-input v-model="form.taskWorkunitId" placeholder="请选择任务排产单"
disabled>
<el-button
v-if="optType === 'add'"
......@@ -259,7 +259,7 @@
</el-form>
<el-divider content-position="center">刀模版申请详细</el-divider>
<el-card shadow="always" class="box-card">
<itemline ref="line" :quantity="form.requestNum" :toolRequestId="form.toolRequestId" :taskId="form.taskWorkunitId" :optType="optType" @sum="handleSumNum"></itemline>
<itemline ref="line" :quantity="form.quantity" :toolRequestId="form.toolRequestId" :taskId="form.taskWorkunitId" :optType="optType" @sum="handleSumNum"></itemline>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button v-if="!form.toolRequestId" type="primary" @click="submitForm">确 定</el-button>
......@@ -477,6 +477,7 @@ export default {
this.form.processId = row.processId
this.form.startTime = row.startTime
this.form.endTime = row.endTime
this.form.quantity = row.quantity
this.form.arrangeCode = row.arrangeCode
this.form.workunitName = row.workunitName
},
......
src/views/mes/tm/toolrequest/selectTask.vue
View file @ 956819fd
......@@ -94,7 +94,7 @@
>{{ "" }}</el-radio
> -->
<!-- 可以手动的修改label的值，从而控制选择哪一项 -->
<el-radio class="radio" v-model="selectedItemId" :label="scope.row.taskId"
<el-radio class="radio" v-model="selectedItemId" :label="scope.row.taskWorkunitId"
>{{ "" }}</el-radio
>
</template>
......@@ -106,13 +106,13 @@
key="taskWorkunitId"
prop="taskWorkunitId"
/>
<el-table-column
<!-- <el-table-column
label="排产数量"
min-width="100"
align="center"
key="quantity"
prop="quantity"
/>
/> -->
<el-table-column
label="单位"
align="center"
......@@ -222,7 +222,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
statusArr: '',
// statusArr: '',
workorderType: 'SELF',
// statusStr: 'PREPARE,BEGINNING,ISSUEGENERATED'
},
......@@ -276,7 +276,7 @@ export default {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
this.selectedItemId = row.taskId
this.selectedItemId = row.taskWorkunitId
}
},
//确定选中
......
src/views/mes/tm/warehouse/itemIndex.vue
View file @ 956819fd
......@@ -58,7 +58,6 @@
<script>
import { lisWoreHouseDetail } from "@/api/mes/tm/warehouse";
import { getTaskIdMaxProcessTool } from "@/api/mes/pro/protask";
import ItemSelect from "./selectmachinesrecord.vue";
export default {
name: "TmToolRequestItem",
......@@ -105,11 +104,7 @@ export default {
};
},
watch: {
'$attrs.taskId'(newVal, oldVal){
if (this.$attrs.optType === 'add') {
this.getTaskList()
}
}
},
created() {
if (this.$attrs.optType !== 'add') {
......@@ -149,25 +144,6 @@ export default {
this.loading = false;
});
},
/** 查询任务刀模板申请单列表 */
getTaskList() {
this.loading = true;
this.queryParams.taskId = this.$attrs.taskId;
this.queryParams.pageSize = 10000;
getTaskIdMaxProcessTool(this.queryParams).then(response => {
const datas = response.data.map(item => {
return {
...item,
allQuantity: item.AllQuantity
}
});
this.tmToolRequestItemList = this.tmToolRequestItemList.concat(datas)
// this.total = response.total;
this.loading = false;
this.$emit('sum')
});
},
handleRemove(row, index) {
console.log(row,index)
// this.tags.splice(this.tags.indexOf(tag), 1)
......
src/views/mes/wm/package/index.vue
View file @ 956819fd
......@@ -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 @ 956819fd
......@@ -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 @ 956819fd
......@@ -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;
}
}
}
}
};
......
src/views/monitor/logininfor/index.vue
View file @ 956819fd
<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="ipaddr">
<el-input
v-model="queryParams.ipaddr"
......
src/views/monitor/operlog/index.vue
View file @ 956819fd
<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="title">
<el-input
v-model="queryParams.title"
......
src/views/system/autocode/index.vue
View file @ 956819fd
<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="ruleName">
<el-input
v-model="queryParams.ruleName"
......@@ -332,4 +332,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
src/views/system/config/index.vue
View file @ 956819fd
<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="configName">
<el-input
v-model="queryParams.configName"
......
src/views/system/dept/index.vue
View file @ 956819fd
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" v-show="showSearch">
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
......
src/views/system/dict/index.vue
View file @ 956819fd
<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="dictName">
<el-input
v-model="queryParams.dictName"
......@@ -343,4 +343,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
src/views/system/menu/index.vue
View file @ 956819fd
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="菜单名称" prop="menuName">
<el-input
v-model="queryParams.menuName"
......@@ -75,7 +75,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" fixed="right" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
......
src/views/system/post/index.vue
View file @ 956819fd
<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="postCode">
<el-input
v-model="queryParams.postCode"
......
src/views/system/printTemplate/index.vue
View file @ 956819fd
......@@ -148,7 +148,7 @@
<el-input v-model="form.templateName" placeholder="请输入模板名称" />
</el-form-item>
<el-form-item label="模板类型" prop="templateType">
<el-select v-model="form.templateType" placeholder="请选择模板类型">
<el-select v-model="form.templateType" placeholder="请选择模板类型">
<el-option
v-for="dict in dict.type.print_template_type"
:key="dict.value"
......
src/views/system/role/index.vue
View file @ 956819fd
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" v-show="showSearch">
<el-form-item label="角色名称" prop="roleName">
<el-input
v-model="queryParams.roleName"
placeholder="请输入角色名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
......@@ -15,7 +14,6 @@
v-model="queryParams.roleKey"
placeholder="请输入权限字符"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
......@@ -24,7 +22,6 @@
v-model="queryParams.status"
placeholder="角色状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
......@@ -37,7 +34,6 @@
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
......@@ -611,4 +607,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
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