|
@@ -26,18 +26,12 @@
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="发货单号" prop="orderNum">
|
|
|
- <el-input
|
|
|
- v-model="screenForm.orderNum"
|
|
|
- placeholder="请输入发货单号"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号(多个单号请用逗号隔开)"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="订单号" prop="mainOrderId">
|
|
|
- <el-input
|
|
|
- v-model="screenForm.mainOrderId"
|
|
|
- placeholder="请输入订单号"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
@@ -115,12 +109,9 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="出库单号" prop="id">
|
|
|
- <el-input
|
|
|
- v-model="screenForm.id"
|
|
|
- placeholder="请输入出库单号"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="screenForm.id" placeholder="请输入出库单号(多个单号请用逗号隔开)"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6" class="tr">
|
|
@@ -515,7 +506,7 @@ export default {
|
|
|
exParams() {
|
|
|
return {
|
|
|
examineStatus: this.screenForm.status,
|
|
|
- orderNo: this.screenForm.orderNum,
|
|
|
+ orderNo: this.screenForm.orderNum.replace(/,/ig,','),
|
|
|
customerName: this.screenForm.jxsName,
|
|
|
customerNumber: this.screenForm.jxsNum,
|
|
|
materialName: this.screenForm.chName,
|
|
@@ -527,8 +518,7 @@ export default {
|
|
|
approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
|
|
|
approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
|
|
|
mainOrderId: this.screenForm.mainOrderId,
|
|
|
-
|
|
|
- id: this.screenForm.id
|
|
|
+ id: this.screenForm.id.replace(/,/ig,',')
|
|
|
};
|
|
|
},
|
|
|
},
|
|
@@ -561,7 +551,7 @@ export default {
|
|
|
pageNum: this.currentPage,
|
|
|
pageSize: this.pageSize,
|
|
|
examineStatus: this.screenForm.status,
|
|
|
- orderNo: this.screenForm.orderNum,
|
|
|
+ orderNo: this.screenForm.orderNum.replace(/,/ig,','),
|
|
|
customerName: this.screenForm.jxsName,
|
|
|
customerNumber: this.screenForm.jxsNum,
|
|
|
materialName: this.screenForm.chName,
|
|
@@ -570,10 +560,10 @@ export default {
|
|
|
correspondId: this.screenForm.warehouse.join(','),
|
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : "",
|
|
|
- approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
|
|
|
+ approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
|
|
|
approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
|
|
|
mainOrderId: this.screenForm.mainOrderId,
|
|
|
- id: this.screenForm.id
|
|
|
+ id: this.screenForm.id.replace(/,/ig,',')
|
|
|
};
|
|
|
getList(params).then((res) => {
|
|
|
res.data.records.forEach((item) => {
|