Skip to content

M
mes-ui
Commit d4cb888d authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

多搜索生产工单和编排单号

parent be4df3a6
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 47 deletions
src/views/mes/pro/arrange/index.vue
View file @ d4cb888d
<template>
<div class="app-container">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="编排单号" prop="arrangeCode">
<el-form-item label="编排单号" prop="arrangeCodes">
<el-input
v-model="queryParams.arrangeCode"
v-model="queryParams.arrangeCodes"
type="textarea" :rows="2"
resize="none"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
......@@ -17,9 +19,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产工单" prop="workorderCode">
<el-form-item label="生产工单" prop="workorderCodes">
<el-input
v-model="queryParams.workorderCode"
v-model="queryParams.workorderCodes"
type="textarea" :rows="2"
resize="none"
placeholder="请输入生产工单"
clearable
@keyup.enter.native="handleQuery"
......@@ -216,10 +220,10 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
arrangeCode: null,
arrangeCodes: null,
arrangeSort: null,
workorderId: null,
workorderCode: null
workorderCodes: null
},
// 表单参数
form: {},
......@@ -263,7 +267,12 @@ export default {
/** 查询生产编排单列表 */
getList() {
this.loading = true;
listGroupArrange(this.queryParams).then(response => {
const params = {
...this.queryParams,
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;，、；。]/).filter(item => item) : null,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
listGroupArrange(params).then(response => {
this.arrangeList = response.rows;
this.total = response.total;
this.loading = false;
......@@ -347,8 +356,15 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
const params = {
...JSON.parse(JSON.stringify(this.queryParams)),
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;，、；。]/).filter(item => item) : null,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
delete params.pageNum
delete params.pageSize
this.download('pro/arrange/export', {
...this.queryParams
...params
}, `arrange_${new Date().getTime()}.xlsx`)
}
}
......
src/views/mes/pro/combination/index.vue
View file @ d4cb888d
......@@ -17,9 +17,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="生产工单" prop="workorderCode">
<el-form-item label="生产工单" prop="workorderCodes">
<el-input
v-model="queryParams.workorderCode"
v-model="queryParams.workorderCodes" type="textarea" :rows="2"
resize="none"
placeholder="请输入生产工单"
clearable
@keyup.enter.native="handleQuery"
......@@ -207,7 +208,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
combinationCode: null, combinationSort: null, workorderCode: null, salesOrderNumber: null
combinationCode: null, combinationSort: null, workorderCodes: null, salesOrderNumber: null
},
// 表单参数
form: {},
......@@ -240,7 +241,11 @@ export default {
/** 查询生产组合单列表 */
getList() {
this.loading = true;
combList(this.queryParams).then(response => {
const params = {
...this.queryParams,
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
combList(params).then(response => {
this.combinationList = response.rows;
this.total = response.total;
this.loading = false;
......
src/views/mes/pro/dta/index.vue
View file @ d4cb888d
<template>
<div class="app-container">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="工单编号" prop="workorderCode">
<el-form-item label="工单编号" prop="workorderCodes">
<el-input
v-model="queryParams.workorderCode"
v-model="queryParams.workorderCodes"
type="textarea" :rows="2"
resize="none"
placeholder="请输入工单编号"
clearable
@keyup.enter.native="handleQuery"
......@@ -295,7 +297,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderCodes: null,
combinationCode: null,
},
// 表单参数
......@@ -336,7 +338,11 @@ export default {
if (!this.queryParams.workorderCode) {
delete this.queryParams.workorderCode
}
getDtaList(this.queryParams).then(response => {
const params = {
...this.queryParams,
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;，、；。]/).filter(item => item) : null,
}
getDtaList(params).then(response => {
this.scheduleSetupRuleList = response.rows;
this.total = response.total;
this.loading = false;
......
src/views/mes/pro/feedback/index.vue
View file @ d4cb888d
......@@ -7,8 +7,9 @@
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="queryParams.arrangeCode" placeholder="请输入编排单号" clearable
<el-form-item label="编排单号" prop="arrangeCodes">
<el-input v-model="queryParams.arrangeCodes" placeholder="请输入编排单号" clearable type="textarea" :rows="2"
resize="none"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工作中心名称" prop="workstationName">
......@@ -19,8 +20,9 @@
<el-input v-model="queryParams.assistProcessCode" placeholder="请输入外协单号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="生产工单编号" prop="workorderCode">
<el-input v-model="queryParams.workorderCode" placeholder="请输入生产工单编号" clearable
<el-form-item label="生产工单编号" prop="workorderCodes">
<el-input v-model="queryParams.workorderCodes" placeholder="请输入生产工单编号" clearable type="textarea" :rows="2"
resize="none"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品物料编码" prop="sapItemCode">
......@@ -315,7 +317,7 @@ export default {
workstationName: null,
workorderId: null,
assistProcessCode: null,
workorderCode: null,
workorderCodes: null,
workorderName: null,
taskId: null,
taskCode: null,
......@@ -333,7 +335,7 @@ export default {
userName: null,
nickName: null,
feedbackChannel: null,
arrangeCode: null,
arrangeCodes: null,
machineTime: 0,
recordUser: null,
recordNick: null,
......@@ -406,7 +408,12 @@ export default {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
}
listFeedback(this.queryParams).then(response => {
const params = {
...this.queryParams,
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;，、；。]/).filter(item => item) : null,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
listFeedback(params).then(response => {
this.feedbackList = response.rows.slice(0, response.rows.length - 1);
this.totalSum = response.rows[response.rows.length - 1]
this.total = response.total;
......@@ -636,8 +643,15 @@ export default {
/** 导出按钮操作 */
handleExport() {
const params = {
...JSON.parse(JSON.stringify(this.queryParams)),
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;，、；。]/).filter(item => item) : null,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
delete params.pageNum
delete params.pageSize
this.download('pro/feedback/export', {
...this.queryParams
...params
}, `feedback_${new Date().getTime()}.xlsx`)
},
//选择生产工单
......
src/views/mes/pro/workstationRequest/index.vue
View file @ d4cb888d
......@@ -18,12 +18,14 @@
<el-input v-model="queryParams.applyNum" placeholder="请输入领用数量" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="queryParams.arrangeCode" placeholder="请输入编排单号" clearable
<el-form-item label="编排单号" prop="arrangeCodes">
<el-input v-model="queryParams.arrangeCodes" placeholder="请输入编排单号" clearable type="textarea" :rows="2"
resize="none"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工单号" prop="workorderCode">
<el-input v-model="queryParams.workorderCode" placeholder="请输入工单号" clearable
<el-form-item label="工单号" prop="workorderCodes">
<el-input v-model="queryParams.workorderCodes" type="textarea" :rows="2"
resize="none" placeholder="请输入工单号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="创建时间">
......@@ -345,7 +347,8 @@ export default {
taskWorkunitId: null,
applyType: null,
applyNum: null,
workorderCode: null,
workorderCodes: null,
arrangeCodes: null,
pickingReason: null,
workstationCode: null,
workstationName: null,
......@@ -436,7 +439,14 @@ export default {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
}
listMaterial(this.queryParams).then(response => {
const params = {
...JSON.parse(JSON.stringify(this.queryParams)),
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;，、；。]/).filter(item => item) : null,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
delete params.pageNum
delete params.pageSize
listMaterial(params).then(response => {
this.materialList = response.rows;
this.total = response.total;
this.loading = false;
......
src/views/mes/qc/ipqc/index.vue
View file @ d4cb888d
......@@ -10,8 +10,9 @@
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="queryParams.arrangeCode" placeholder="请输入编排单号" clearable
<el-form-item label="编排单号" prop="arrangeCodes">
<el-input v-model="queryParams.arrangeCodes" placeholder="请输入编排单号" clearable type="textarea" :rows="2"
resize="none"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品物料编码" prop="sapItemCode">
......@@ -369,7 +370,7 @@ export default {
ipqcType: null,
templateId: null,
workorderId: null,
arrangeCode: null,
arrangeCodes: null,
workorderName: null,
taskId: null,
taskCode: null,
......@@ -445,7 +446,11 @@ export default {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
}
listIpqc(this.queryParams).then(response => {
const params = {
...this.queryParams,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
listIpqc(params).then(response => {
this.ipqcList = response.rows;
this.total = response.total;
this.loading = false;
......@@ -622,7 +627,10 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
const queryParams = JSON.parse(JSON.stringify(this.queryParams))
const queryParams = {
...JSON.parse(JSON.stringify(this.queryParams)),
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
delete queryParams.pageNum
delete queryParams.pageSize
this.download('mes/qc/ipqc/export', {
......
src/views/mes/qc/report/index.vue
View file @ d4cb888d
<template>
<div class="app-container">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="编排单号" prop="batchNumber">
<el-form-item label="编排单号" prop="batchNumbers">
<el-input
v-model="queryParams.batchNumber"
v-model="queryParams.batchNumbers"
type="textarea" :rows="2"
resize="none"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
......@@ -381,7 +383,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
batchNumber: null,
batchNumbers: null,
processId: null,
processCode: null,
processName: null,
......@@ -443,7 +445,11 @@ export default {
delete this.queryParams["beginPurchaseDate"]
delete this.queryParams["endPurchaseDate"]
}
listReport(this.queryParams).then(response => {
const params = {
...this.queryParams,
batchNumbers: this.queryParams.batchNumbers ? this.queryParams.batchNumbers.split(/[\n,;，、；。]/).filter(item => item) : null
}
listReport(params).then(response => {
this.reportList = response.rows;
this.total = response.total;
this.loading = false;
......
src/views/mes/tm/toolrequest/index.vue
View file @ d4cb888d
......@@ -25,9 +25,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-form-item label="编排单号" prop="arrangeCodes">
<el-input
v-model="queryParams.arrangeCode"
v-model="queryParams.arrangeCodes"
type="textarea" :rows="2"
resize="none"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
......@@ -376,7 +378,7 @@ export default {
startTime: null,
endTime: null,
requestNum: null,
arrangeCode: null,
arrangeCodes: null,
workunitName: null,
},
// 表单参数
......@@ -421,7 +423,11 @@ export default {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
}
listTmToolRequest(this.queryParams).then(response => {
const params = {
...this.queryParams,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
listTmToolRequest(params).then(response => {
this.tmToolRequestList = response.rows;
this.total = response.total;
this.loading = false;
......
src/views/mes/tm/toolrequestlist/index.vue
View file @ d4cb888d
......@@ -25,9 +25,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-form-item label="编排单号" prop="arrangeCodes">
<el-input
v-model="queryParams.arrangeCode"
v-model="queryParams.arrangeCodes"
type="textarea" :rows="2"
resize="none"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
......@@ -123,7 +125,7 @@ export default {
workunitCode: null,
workunitName: null,
toolCode: null,
arrangeCode: null,
arrangeCodes: null,
},
// 表单参数
form: {},
......@@ -140,7 +142,10 @@ export default {
/** 查询上机明细列表 */
getList() {
this.loading = true;
const params = Object.assign({}, this.queryParams)
const params = {
...JSON.parse(JSON.stringify(this.queryParams)),
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
}
delete params.type
listWorkTmToolRequestList(params).then(response => {
this.recordList = response.rows;
......
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