Commit 9d89aaf9 authored by tanjunxin's avatar tanjunxin

fix: 生产工单及生产标签打印更改为多行查询

parent 5ac75dc5
......@@ -11,18 +11,24 @@
v-show="showSearch"
label-width="70px"
>
<el-form-item label="编排单" prop="arrangeCode">
<el-form-item label="编排单" prop="arrangeCodes">
<el-input
v-model="queryParams.arrangeCode"
v-model="queryParams.arrangeCodes"
placeholder="请输入编排单"
type="textarea"
:rows="2"
resize="none"
clearable
@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"
placeholder="请输入工单编码"
type="textarea"
:rows="2"
resize="none"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -371,8 +377,8 @@ export default {
return {
// 查询参数
queryParams: {
arrangeCode: null,
workorderCode: null,
arrangeCodes: null,
workorderCodes: null,
},
rules: {
packType: [
......@@ -420,12 +426,17 @@ export default {
},
/** 查询工单列表 */
getList() {
if (!this.queryParams.arrangeCode && !this.queryParams.workorderCode) {
if (!this.queryParams.arrangeCodes && !this.queryParams.workorderCodes) {
this.$message.error('请输入查询条件')
return
}
this.loading = true
workorderList(this.queryParams).then((response) => {
const params = {
...this.queryParams,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;,、;。]/).filter(item => item) : null,
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;,、;。]/).filter(item => item) : null
}
workorderList(params).then((response) => {
console.log(response, 'response')
this.tableList = response.rows
this.total = response.total
......
......@@ -16,23 +16,26 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工单编码" prop="workorderCode">
<el-input v-model="queryParams.workorderCode" placeholder="请输入工单编码" clearable
@keyup.enter.native="handleQuery" />
<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="sourceCode">
<el-input v-model="queryParams.sourceCode" placeholder="请输入来源单据" clearable @keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item label="订单编号" prop="salesVoucher">
<el-input v-model="queryParams.salesVoucher" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
<el-form-item label="订单编号" prop="salesVouchers">
<el-input v-model="queryParams.salesVouchers" placeholder="请输入订单编号" clearable type="textarea" :rows="2" resize="none" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品编号" prop="productCode">
<el-form-item label="产品编号" prop="productCodes">
<el-input
v-model="queryParams.productCode"
v-model="queryParams.productCodes"
placeholder="请输入产品编号"
type="textarea"
:rows="2"
resize="none"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -61,8 +64,8 @@
</el-option>
</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="workorderType">
......@@ -729,15 +732,15 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 50,
workorderCode: null,
arrangeCode: null,
workorderCodes: null,
arrangeCodes: null,
workorderName: null,
orderSource: null,
sapItemCode: null,
// sourceCode: null,
salesVoucher: null,
salesVouchers: null,
productId: null,
productCode: null,
productCodes: null,
productName: null,
productSpc: null,
routeName: null,
......@@ -1049,7 +1052,14 @@ export default {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
}
listWorkorder(this.queryParams).then((response) => {
const params = {
...this.queryParams,
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;,、;。]/).filter(item => item) : null,
salesVouchers: this.queryParams.salesVouchers ? this.queryParams.salesVouchers.split(/[\n,;,、;。]/).filter(item => item) : null,
productCodes: this.queryParams.productCodes ? this.queryParams.productCodes.split(/[\n,;,、;。]/).filter(item => item) : null,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;,、;。]/).filter(item => item) : null
}
listWorkorder(params).then((response) => {
this.workorderList = this.handleTree(
response.rows,
"workorderId",
......
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